The way your R5 shoots I wouldn't mess with it. I'd get another action, stock and etc. for the Bartlein barrel. I wish I had just bought a beater rifle from the pawn shop and put the Bartlein on it from the get-go. Heck the only thing left from the original AAC is the bolt and receiver.
Guns are not dangerous! People are! RKBA!