Re: Top end "Clatter"
When I did mine, there was areally loud ticking form the variator (maybe variator solenoid).
I dunno if this is it your noise or not.
To clear it you either take it for a razz, it should quieten down when the variator has activated a couple of times.
However i found the quickest way to reset/clear the variator controller solenoid so it doesn't make any noise is to unplug the lead to it - it's located part of the way along the injector rail - turn the engine on and run it for 30 secs. Turn the engine off and plug it back up. When you fuire the engine up next time it should all be quiet.
Dunno if this is your problem.. but thought i'd chuck it in anyway