Did you re-power with the Yammie? Just thinking (dangerous, I know), I believe that newer Merc 115 2.1 L would allow you to keep your old controls, and save you a couple grand on the motor price, too. with nearly 20% more displacement, pretty sure it out performs the Yammie and runs only 365 lbs or so. For performance perspective check out Bigshrimpin's performance - he just re-powered his 23 with a late model 150 Merc 4-S and is producing some very impressive numbers. Which ever color you choose, good luck with your purchase - modern motors are sweet!
Here's bit of that thread:
http://www.classicseacraft.com/commu...t=28644&page=3
check his metered performance on page 9.