If your happy with your existing engine that's the way to go, much cheaper than a re-engine and keeps you with your trusted, known engine.
Only pitfalls being next upgrade may be harder to source correct shaft length but I guess you could always readjust the transom to suit. Extending the leg may be more expensive but it should add value when you decide to sell it, if it still has life in it when that time comes.
Peter @ Boatsandoutboards4sale ~
askboatsandoutboards4sale@sky.com ~ 07930 421007