05 e4 needs motor upgrade

I have an 05 e4 and the motor is overheating and the speed sensor is shot (getting 81 & 82 error codes). I live in hilly area in STL called The Hill. I have noticed a degrade in speed after a couple miles and last Friday after 5 miles I got the Turtle.

I have a MM that worked pretty good for the stock 5hp. I want more power climbing hills (maintain speed up hills) and more top speed on flat surfaces 30-35mph. The best I ever got on the flats was 26-27 and 30-32 on a big downhill. I have 195-50-15s on it.

Should I go with a stock GEM 7hp for the extra torque or go for something like a Ride-4-Fun 7.5hp?