Good decision to go with the compromise Tned.
I hope you found a good workable easy to implement solution, I was certain something could be done but did not look any more after you gave the impression you didn't want to go that route.
While this may be a little more hassel at upgrade it should be less hassel for modding, so have to give some take some.