Could DJ mean a High thrust yamaha? Before I would give up a great motor like you have I'd check to see if your battery, motor, galley and cooler weight are all on the starboard side as I suspect.
The engineer who came up with the weight distribution on these lightweight boats (23.5/240/26/260) overlooked the obvious heavy gear creating a list to starboard. In both my 240 and newer 260 I had to move the battery(s) to port and redistributed galley weight which alleviated most of the imbalance due to the OB/batt/cooler/galley wt.
I bet your buddy wants to help you get rid of that 9.9 yam w/pwr tilt. The motor on my 260 is listed as '04 8hp yam/4stroke/high thrust/long shaft/elec tilt/pedestal control but it's virtually the same size/wt motor which is now designated as a 10hp.
http://www.outboard-engine.com/enginespecs.php?recordID=200 I have over 1k hrs on it and wouldn't trade that elec start/tilt for ANYTHING.
If it's newer than 6-7yrs old, it's a great motor design. Unless it's physically larger or older than the link or motor pic below I'd look elsewhere in the boat for your weight distribution problem.
Good luck in your new boat. Mike