I know this isn't actually an answer to your question, but have you looked into using the conditional disable diagram structures? That might be a good way for you to maintain multiple versions without generating conflicts. From personal experience, I can also tell you that plug-in architectures based around VI server are another approach that works pretty well.
Jason