Excellent stuff, Dave. 35 Super working well for you it seems. I don't think a 40mm PA scope is too much. Something like a 2-7x32 would be ideal l, maybe.
AA Diabolo Field at 16 grains would not be my choice but they are doing the business for you. 35s normally work well with the light to middleweight RWS/ H&N pellets I use but I may well give AA's a go now. I like to keep an open mind and experiment with new pellets.
How do you compare the 35S to your RWS 45? Had the safety catch/ lack of ghosting You?