Okay, I flattened both nodes, reinstalled 2.2.6-RELEASE and then restored the config to the master, and just an XML with interfaces, gateways, CARP addresses and users to the secondary.
After setting up pfsync and XMLRPC again, it seems to be alright, but I guess time will tell!