well, had my "fitting" at AG today. The guy, really sounds guy, recommended to persevere with my current clubs as a lot is down to my current swing, which I conisidered might have been the case, but confirmed now.
Only thing he suggested to look at in the "near" future is my wedges, I bought...