Option 3:
Create two templates, one for the Adagios and one based on Sonnex, populate them with your standardized components and user interfaces, and just not link to the pages for the sub systems that are not in the system.
Having a template to start out with for some of the components that requires alot of mysterious page flips to work correctly is a real time saver. The IServer and IDOCK V comes to mind.

That is one of the main goal for us this year, standardizing on all the programming. Starting to rework our modules in SIMPL so they populate the buttons correctly in SB.