"Good" rifles is relative. If your shoots really well then I'd just consider a good barrel. Yes, it can be as much as a new rifle with a stock barrel, but, it will shoot much better. I'd not trade unless the new gun has a premium barrel.

For now just learn to shoot better. Use quality bullets and concentrate on loading technique. Then, consider a new barrel in a chambering of choice. If I were doing competition at longer range I'd be tempted by the 7mm's, like the .284 or PRC (would take some research and advice from Fuj and others).