How about staying at war, blockading and pillaging Ichabod for about five more turns then getting a peace treaty out of sync with Mackoti? Do we earn money from blockading? I'm sure I have in SP... 
Civics - I'd stick with OR for another turn at least, definitely until we've got enforced peace with Mack (I can live without the stress too) and possibly then until Wall St is done. We don't have any pressing military plans right now and I don't see any of our neighbours charging into us straight away (although we need to keep a close eye on dtay), so why not pre-build all the units we can, then build wealth and get some techs that allow them to queue-upgrade? We'll probably complete the units before decay kicks in, and the only thing I think we lack right now is Cannons. (Bear in mind though that if two units queue-upgrade to the same thing we'll lose the hammers from one of them.)
Civics - I'd stick with OR for another turn at least, definitely until we've got enforced peace with Mack (I can live without the stress too) and possibly then until Wall St is done. We don't have any pressing military plans right now and I don't see any of our neighbours charging into us straight away (although we need to keep a close eye on dtay), so why not pre-build all the units we can, then build wealth and get some techs that allow them to queue-upgrade? We'll probably complete the units before decay kicks in, and the only thing I think we lack right now is Cannons. (Bear in mind though that if two units queue-upgrade to the same thing we'll lose the hammers from one of them.)
Completed: RB Demogame - Gillette, PBEM46, Pitboss 13, Pitboss 18, Pitboss 30, Pitboss 31, Pitboss 38, Pitboss 42, Pitboss 46, Pitboss 52 (Pindicator's game), Pitboss 57
In progress: Rimworld
In progress: Rimworld