I'll see what I can do, there. Honestly leaning towards just replacing the known bad u-joint and seeing if that fixes everything.
That said... the u-joint is being a total PITA. Pressed it out on one side, removed the cover, starting trying to press it the other way and I guess it wasn't...