If you're really already point on at 15-20 yds, you're arrows are dropping fast, and I have to think they're loosing a lot of energy on the way.
I like an arrow right around 10 gr. per lb.. It quiets the bow nicely, and allows me to get some decent weight up front. Your current set up is a hair over 8, and the new set up is over 13. If it were me, I'd stick with the lighter arrow that's flying good, over the heavier one that's getting lobbed. 8 gr. per lb is at the low end, but still a safe and acceptable weight. The only reason I'd go up in weight, was if my bow was loud.