The instructions I gave you do work. I’ve just confirmed this if anyone finds themselves in a similar predicament. I know the edit you did on the cmdline.txt file using a Windows editor is where the problem lay. Anyway you found your password so all is well. What login user are you using. The default user is pi. Did you change that at any stage. If you have the desktop GUI enabled and set for auto login you’ll never have that problem again.