Hi Chris,
I replaced my Tohatsu 6hp, which I assumed to be the original, towards the end of the season, two years ago. Similar circumstances to yours – it gave up the ghost and deemed to be beyond economic repair.
I replaced like for like, partly because of cost – the price quoted seemed to be cheapest option - and partly in that I wanted to get back out on the water and didn’t really have time for much research. The new one has proven to be fine. Seems slightly bigger but no other issues, and performs well.
Interesting that you mentioned short shaft. The recommendation from the dealer, having confirmed with whatever manual, was that a long shaft was the correct model. I wondered what others might be using!
Anyway, here’s to a good season!
Regards