Before even thinking of messing with alignment, try subbing the last IF tube. It can cause ringing that can be mistaken for misalignment.
On that stripped gear, your shrink tubing collar is a good idea in addition to epoxy. "Belt and suspenders" redundancy.
