OK, back at the PC now. I managed to reproduce your problem and resolve it with the commands:
bcdedt /set optionsedit yes
bcdedit /deletevalue optionsedit
so try the second of those. If that doesn't do it try
bcdedit /set optionsedit No
I hope one of these works for you. (You didn't waste your time downloading BCDEdit - it's a useful program, particularly if you want to dual-boot, but I couldn't see how to make it solve this problem.)
Just wanted to say, I found this looking for a reason why I got the 'edit boot options' screen on bootup on my stinkpad running windows 7. The second option, bcdedit /set optionsedit No, worked perfectly. Thanks!