Rich, Both engines you mention would be fine, but if I had your OS I would use it before buying a new one. If you use a low pitch prop you will ave plenty of vertical, and won't be fling it to fast.

If this is your first big bipe note that you will want to carry some throttle on landing tell your ready to flare. If you loose your engine you will wont to get to the runway fast.