Well my new RWS 34 p had all kinds of issues!!

OP, I'm glad to see you finally got this squared away, and an excellent quality airgun on the way! As well, you've made some friends, and you can reach out to them for advice and information on the new '95. I assume that AGD will be replacing the original rifle, hopefully with one that works, and in the end, you'll not only be made whole, but you're getting one HELL of a deal on the '95, seems like! 

Happy New Year to you and yours, sir.
 
I recently got one from Cabela's, a .22 pretty good deal with a mount and scope. It had some of the same problems your did, stock rubbed, caught that quick and used some sand paper in the stock to get it off the barrel block, didn't take much, just a few passes. Overly tightened barrel cocking was very gritty, in fact a couple of times it locked up half way through the cocking stroke, took it apart and the seal had a cut in it, flap hanging off the side. fairly sure mine was a return too, because the piston was in perfect shape,not a scratch, but the the tube had a lot of scratches from being cocked, sanded those out with 1500 sand paper, bought a seal from Vortek, greased the spring with some Vortek spring grease I had, a tiny bit of moly and polishing in all the usual places, and it's now a nice gun. interesting take you say about the barrel, I never pushed a pellet through it, I was worried it would get stuck, this barrel is choked more than any pellet gun I got. In the end it cocks smooth, no sound when cocking, no spring twang when shooting, dime groups at a range finder 25 yards most the time, but this gun is not forgiving at all, not like a HW95 is. The HW95 is a better gun, more forgiving to shoot and much easier to work on, you don't need a spring compressor to get into it, and my 95 .22 would murder my 34 in competition, may not be true for everyone's, but it is for mine. You done the right thing getting the HW95, now with all that said, I do love the 34 also. Here's a pic of it, with an AGH Apex muzzle weight, it earned it.

1546206368_15229732895c293ca0f21414.47242890_CIMG1749.JPG

 
Dad uses a nylon cleaning rod or etc he just made it just for pushing pellets through. During push through if it's a good bore it glides nicely but if it tightens up in spots the barrel has tight spots..He said cheap guns are awful but sometimes you get lucky when the use a new Grove bit for barrel or one that is wore out.... one off dad's 34 panther older ones has zero tight spots and shoots really good. Even though they have a choke dad's good shooters have no tight spots.
 
I recently got one of the synthetic stocked, .177 combos from Cabelas right before they went out of stock. I thought it was an amazing deal and couldn't pass it up...until I shot it. The barrel hinge bolt was WAY too tight - easy fix, but the spring was canted so badly that the cocking shoe rubbed against it both ways (while cocking and while returning the barrel to the locked position) and it honked like a goose from what I assume was zero lubrication internally. I have enough springers already and didn't feel like making any effort to fix this one - it went right back to Cabela's and hopefully wasn't re-sold to anybody. I know that Diana doesn't have the same QC as Weihrauch, but I have to assume this was just a bad egg that somehow slipped out of the factory. Too bad, because despite all it's drama, it seemed to shoot quite accurately and seemed like a nice gun. 
 
Well I guess the pellet God's do not want me to have a new German rifle. I ordered the hw95 luxus on Dec. 28 and it still wasn't here nor have I got a email stating it shipped from Airguns of Arizona. Well I called today and he said I'm sorry it's out of stock, I said bud I ordered it on the 28th. If you look right now it still shows it's in stock. So I am stuck ordered the scope mount and a muzzle break for it and who knows when they will get it restocked. Just my frigin luck!!!!