Fashion brought in the 25" barrels, fashion replaced them with the 30 inches (in America) and eventually fashion will reboot the 25 inches again. So if you wait the 25s will eventually be OK.

Tongue in cheek but not so much. This made in the US recent fashion that disqualifies 25 inch barrels, considers 28 inches "short" is entertaining seen from a European point of view.

Sell the XXV and get something else, rebarreling is not only expensive, it will take forever.