That is one problem solved.

I wish you luck is your search for a barrel set that might be adapted to fit.

There are,of course, barrelmskers, who could build you a new set of tubes but the cost would be prohibitive.