If you give high points for quality like I do, you can match but you won't top HW and FWB.
Here is a thought, albeit an expensive pill to swallow if you go with quality components: how about modifying something you already have to make it different? Since the HW30 is the only gun you have two of that would be your logical choice to keep within your budget.
I love the old vintage 10m diopter sights. A really nice HW rear diopter is going to set you back $150 to $180. If you get crazy you can buy many different Gehman irises to screw in that will set you back another $60 to $????? You can even get cool irises to screw into the front sight tunnel. Add an adjustable recoil pad and you have a super sweet little gun that may encourage you to take up 10m paper punching a little more seriously and even get involved in those postal matches some guys enjoy.
Here is an example of an HW30 I added some nice hardware to.
Another thing to consider is a pistol. You can get a nice HW70 break barrel pistol for $200. They are not the equivalent of high end match pistols but they are minute of soda can accurate to 25 yds. and will challenge you to learn to shoot something different. For more $$$ but probably still within your budget you can find a used HW45 or HW75.
View attachment 399271