Upgraded and Now Open Directory Hosed

I upgrade my Mac Mini running Server to Mavericks and then Server 3, however in the new server app my Open Directory service is marked as Off, when I turn it On I get asked if I want to create a new OD master, join a domain as a replica or restore the domain from an archive. So from what I can see the upgrade has lost my OD data :-( I have an archive of the OD master I took before I started the upgrade, but when I restore it it doesn't seem to 'take' and I am left in the same situation.

If I try to create a new OD domain, I get to set the diradmin password etc I get an error "An unknown error occurred while verifying directory administrator settings"

So I'm stuck and am going to have to roll back to the pre-upgrade backup of the server but I really need to know how to either (1) keep my OD data during gthe upgrade, (2) be able to restore from an archive or (3) rebuild the OD domain from scratch - any one of those would let me get things up and running.

Any suggestions?