There is no objective way for any of us here to give you advice without watching you ride. If you could provide video of you riding on rollers or a trainer we could give it a shot, but without visuals, pretty much anything recommended here is crap.

Fitting, done right, by professionals schooled in exercise physiology, is a science. It's worth every penny to me. Done by bike shop employees, maybe not.