I may have missed this somewhere in the various posts but instead of letting the 600's have a big bore kit why not have a weight penalty on the 620's sp power to weight is closer? Then as Paul has said the 600's will eventually die out as the 620's become more affordable and the weight penalty can be lifted on them.
Another quick question, how can I persuade SWMBO that I really should race her M600
Darren