Awesome, thanks all. Some good news. While digging through a plethora of bits and pieces, I came across a M98 Apex barrel I picked up a while ago (for the tip only). Sure enough, it fits like a glove! A buddy of mine will be inheriting this marker so I'll put the onus on him to decide if he wants a new barrel or not.