You did good! And the Etec is a nice motor.
A year ago, I repowered mine with a Merc 150 4S and also swapped out my 25hp Merc kicker in favor of a new 9,9 EFI ProKicker. I stayed with Merc mainly so that I wouldn't have to change out the controls and gauges. It was all plug-and-play, I did it all myself.
Not that the Opti was a bad motor ... as 2-strokes go, it was excellent. Started easy, never saw any visible smoke, reasonably quiet, and really good on gas. But they are kind of known for compressor issues before they reach 1K miles and mine was getting close, and I was tired of buying DFI oil for $40 a gallon. The 150 4S is a little quieter and smoother, a little better on gas, and doesn't consume oil. And it didn't cost much to upgrade. I got the 150 4S as a CPO, with zero hours, literally looked brand new, for $8.5K, and sold the Opti for $4.5K.
The 9.9 EFI ProKicker is massive step forward from the 2007 vintage 25hp kicker I had. Much lighter, smoother, and generally better running.