x2 on the new engine in the 21!
For the money you save on getting & re-rigging/fixing a 23 you can put something like this in the 21:
380HP FWC L96 Small block pushing a 290 Duoprop.
http://www.volvopenta.com/volvopenta...V8-380-CE.aspx
Let the 21 really perform!