I'd get a 50, common mistake to not max out the HP on boats. As you've noticed with how it was setup currently. 

Most of those current mid-size 4 strokes are pretty well thought of it seems. Merc, Yammi, Honda, Tohatsu, Suzuki. 

Yes Tohatsu makes some motors for Merc and others in some of the smaller sizes