You should check into a Python. He will make any match you need with the added bonus of a set of sizer inserts!
He did an A5 barrel to newer angel body for me and I bought the "body" part of the kit for the rest of my guns. So you buy one kit ( body + inserts ) and just the body for what ever other guns you have ( body by itself is cheap!)= Great Deal!
Python Paintball, Give Your Balls A Squeeze
Good Luck!