Thanks GT, this gives me a plan of attack and good tips on how to reassemble it.
I have re-used old MC's in the past with no problem at all, but in this case I thought "this time I will spend the money, get a 'new' one built up, and be 100% confident" , but - you know the story from there.....
Cheers,
Mitch.