My 25 is being rigged right now with a Honda 135 and 15 kicker. I did read a few articles where they compared the Yamaha and Honda, the Yamaha was said to be a little quieter and smoother running. So I would think the Yamaha would make an excellent engine choice.
It sounds like you are...