Nope, the easiest thing is to do what I suggested and email Skuzzy. Otherwise, you have to do a lot of work and you're forcing your squaddies to rejoin - don't know about you, but your suggestion doesn't sound easier than mine.
Yep, but unless you want to wait until the bug is fixed to clean up your roster...Well, you're free to work around the bug as you see fit; I only made a suggestion as to a course of action.