Drop in?
Removing the 2QM and going to a G series engine will make a world of difference, even if you stay with two cylinders. The term drop-in is relative to your (or your mechanic's) experience and ability. The engine can be made to fit quite easily and, as I recall the H36, there may be room behind the engine for some of the extra length of the 3GM30F. If you make the change, don't forget the F.