The NT-18 piston and liner is a possiblity, or if you want to spend some extra cash on you could go for the O.S .18 CVR-X engine.

I'm not sure whether it's a straight drop in or not but, 'poor judgement' has a webpage on the evolution of his Fun Factor which has details of what he did with his O.S .18.