I love this group!

I have recently purchased an investigator and seem to be on an infinite path to spend all my time and money on her, but I love this boat!
My next purchase will be a new outboard for reliability.
I have a motor on her at the moment, but it possibly dates back to the industrial revolution itself.
It is a short shaft 5hp 2 stroke that pushes the boat along ok but in a storm and strong current it really did struggle...
I am going to purchase a brand new motor so as a girl trying to remember how to sail etc. I don't have to worry about being able to make it back home under power if a storm or something pops up.
I am thinking a 8 hp mercury 2 stroke or 6-7 hp Yamaha 2 stroke (4 strokes seem too heavy and expensive)?
I was also thinking of having a thrust propeller.
I originally I wanted the gears on the handle so i don't have to hang off the back of the boat to chuck it into reverse, but i think this might not be available in these lower hp engines...
I have a spring bracket to attach and lower it on the back of the boat, so should be ok with a short shaft.
Would anyone recommend a brand or hp for these great boats

Cheers,
Alisha