Thanks for everyone's help.
I think I'm look at going with Dennis from LouDen Motorsport or Craig from Scope for the rebuild because of your recommendations and previous posts from the past. I really appreciate the other suggestions as well as I now I have options for local mechanics when something breaks in the future or I need a service.
I'll let you know the outcome and what work I get done. I'm still interested if anyone has any recommendations on any upgrades while the motor is out.