Cool, i notice you are only in london anyway, if you get really stuck i can probably lend you a hand.

Air leak is still one of the favourites though, espeically based on what you are saying about not idling below 3K etc