Had a tinker today, took the stock off and went to work fiddling with the grub screws
First stage is now much better and second stage weight/release is crisper. Much nicer trigger for me now. All I gotta do now is get the courage to drill the stock for my sling/bipod (sling for HFT, bipod for rested HFT).
Have to say, I was shooting at Petes Airgun Barn yesterday and it was taking no wind at all, mind you, I was indoors