86, you have probably solved this issue by now, but my two pennyworth.
Go and see a proper 'independent' fitter, not someone based out of one of the superstores. Generally speaking, they are as much a fitter as I am a rocket scientist.
I spent a not inconsiderable time with a Maryland based fitter who was fantastic. We started by properly gapping my irons from PW back up the line. My longest iron is a six which is set at 32Â°. I now have three hybrids in my bag set at 28Â°, 24Â° and 20Â°. Carry distances are 185, 200 and 215. These are Wishon 775HS. A proper fitter will sort you out wi