Okay, this is getting annoying.
I installed the latest Intel Storage Matrix Manager, which did something to the drivers. Whatever it was, the system wouldn't boot in either mode due to a "corrupt boot image", but that did not not seem final because Intel's directions say to use the F6...