Bob - I had my existing motor rebuilt, including paying a little extra for it being 'drop in ready'...meaning, it was fully running, timed, everything when I picked it up from the machine shop.
It'd sure be nice to see your boat at the meet this year!