Just one of those things that nobody can answer for you. There's an argument that can be made for either side.
Get you a spiral notebook... Loose leaf paper Works too, pen or pencil. Now you're going to on one sheet start writing down what you like about the rifle. Then write down what specifically about the rifle is keeping you from shooting well, impeding your comfort, this isn't just a compare-and-contrast... It's what is specifically keeping you back.
You got to do the same thing with the optic. Your current optic how is it impeding you from shooting well?
Let's say for example the scope that you have does very well for you about to say 600-800( whatever distance you choose is 80% of where you shoot). You shoulder the rifle it doesn't fit well, you don't like the trigger but it's usable... Well the obvious choice is you fix the rifle as necessary. Upgrading the scope would be a waste of money at this time when compared to getting the gun the way you want.
Same thing to be said for the scope let's say you mount a rifle and it's very comfortable trigger isn't great but it's manageable... But the scope doesn't quite give you the clarity that you want and is keeping you from going past say 600 yards hundred yards... then get the scope.
Basically what you're doing is giving you a logical Quantified list to determine the difference between want and need