ok here is my issue... i enjoy the 16 in heavy barrel Ar that I have now, but it is lacking the accuracy. Is it worth it to swap out the heavy barrel to a bull barrel or should i just go with a new upper reciever with the barrel? Too many options. As a background i have shot NRA matches, USMC...