Congrats on the rebuild.
My motto to myself comes to mind when I see this build...
If it needs to be fixed or replaced, why not just upgrade.
And since you will be changing to a tubed front end, its an upgrade.
Wish I could help, but my mechanical skills are still in the nill...
(I already have my own issues to deal with...)
Good luck, and gods speed on the recovery!