Hybrid

I have the same set up. I got fitted with a 21* a half inch short. Filled the gap perfectly. A good Titleist fitter will find something that works for you.

Is there a distance gap? While I have hybrids to replace 5 & 6 irons, my 20 degree fairway gaps nicely with the 23 hybrid/5 iron. You can trial and error but at the cost of new clubs, getting gaps checked between the 2 longest irons and driver might be the cheapest option.

I also game a GT2 21 degree 7 wood and my next gap is a 24 hybrid which almost fits perfectly. I'm currently gaming a 24 D913 hybrid and have my eye on upgrading to the new GT2 24 degree to refresh my set up.