I don't know if you have seen them or not, but if the stock was the worst part of your R7 then take a look at this:

Steve is making them now and they are sweeeeeet!!! I was gonna buy an R7 just so I could get him to cut me a stock for it.
On the subject of "missed airguns". I had an RWS M92 (aka Cometa 220). It was maybe a $100 gun, youth sized, a bit twangy, and I never even lube tuned it because I could shoot one holers all day long with it. It was my first real break barrel adult air rifle and one day I got stupid while selling another 7-8 guns and put that one up for $70 I think...duh me! I still miss that one and wish I still had it....it was just a pleasant gun for me to shoot. Shot in the low 700's in .177....stupid, stupid man I am.