Today rebuilt the bike and am now 95% there just have some final tweaks with the throttle cable and give a once over prior to giving her the first kick.
All seems good and the rear wheel problem is now gone, I believe the bearing change and shaft work did the trick.
Once Iv fully finished will update all items changed and problems found.