[DeepThought]

I think gathering up all national organizations under a different federation isn't impossible. The reason AIDA and FREE never united was due to different rules and the inability (or willingness) to discuss.
With finswimming and WU rugby/hocky the rules are already homogenic for all the organizations under CMAS, so all that is left to do is connecting all national organizations under a new flag. A few votes and a lot of work for those elected might just do it (and ofcourse the redirection of money from CMAS to this new organization).
If there are enough devoted people who see this ideal they can make it happen.
Once all are united under a new organization all that is left is to either join back with the defeated CMAS or approach the IOC independantly. Since sport is made FROM THE PEOPLE WHO PRACTICE IT I think the IOC will act against it's own spirit not to acknowledge this new organization.
Might take a few years but might be worth it.