@Geoff ******
and this topic is about to be closed as well.
I would imagine when you go back to the UK in Dec-Jan you will have an idea of what is happening insurance-wise on the O-A visa situation.
THEN you can contact the consulate that issued the visa, see about getting a NEW 90 day Non-O visa from them AND see about canceling your current O-A.
Again, I think you're WAY ahead of the game on this and suggest one final time to WAIT and see what's actually going to happen..