Get a cocker-threaded gun and you'll have no problem finding a barrel kit to match today's paint.
As for your last criterion, it's up to you, but you've already learned the challenges that come with shooting an older, quirkier gun.
Everybody: Let's ease up on the red loctite, 'kay? Thanks. MCB Feedback