So I ended up going for a bike fit as I was having a bit of knee pain. She made some adjustments that I hope will improve things. She also recommended swapping my 110mm Enve stem for a 90mm stem and flipping it to give 7 degrees of rise. Also she recommended swapping the bars (3T carbon 44 cm) for 40cm ones with less reach and less drop.
I'm thinking of going for these bars which would seem to fit the requirements
I like the look of the Enve stem so would be inclined to get the 90mm version which can be flipped to give 6 degrees of rise rather than her recommendation of 7 degrees but I presume that difference will be negligable.
If anyone has any other recommendations for bars/stems to look at they would be gratefully received.