I've sorted those two niggles. "Advanced System Settings" fixed both in about a minute. I'd not looked there before. Easy!
The "boot"option via ASS is far easier than messing with BCDEDIT.
The next test is to time this and XP - I doubt there will be much in it.