Nodes and users out of whack

I'm having an issue with OG at clients.civicactions.net. My account "dan" cannot be subscribed to the "CivicActions" group (we have CivicActions and Beluga groups). Right now we have two OG groups. After creating the first one we created some content and some users. After creating another group I'm having trouble subscribing one of the "old" users to the new group. Also content that was created for the "old" group cannot be assigned to the new one. Furthermore some content doesn't have a group. This means that a) you can't edit these posts since everything needs to belong to a group and b) that I can't assign this stuff to its proper group. I have no idea how we got here - but I'm not surprised given the shenanigans we were pulling earlier with trying to mix node-role with OG. Basically I'm wondering if there is an easy way to recover or whether I'll have to start from scratch.