You are on the right track, I would say Shafiroff. I would avoid "GMPP" engines as I hear they have been having some quality control issues with some of the shops that they subcontract to build their engines. Never heard a bad word about either Shafiroff or World though.