Jae, 

Look at working with your local Club Fitter.  They can use a launch monitor to better dial in your gaps.  That said, I would look at replacing those irons with the 21* and 24* hybrids.  You should be able to dial in the proper gaps by utilizing the loft adjustments on the club head.  

Cameron 

1-888-TITLEIST

Thank you Cameron!

The H 21 and H 24 are great selections, there is also a H 27 and H 19.  I would fill in the yardage vice looking at the lofts.  If our 5 iron is 185 carry and your H 17 is 230 carry how do you want to fill in the yardage would be key.  You might only need a 205 yard club to fill in.  

5 Iron 185

X hybrid 205 (I would look at the 27 and 24 degree), I would not be shocked if you ended up hitting the H 27.  The loft is the same as a 5 iron but the extra shaft length ( 1" in the H 27) might get you the additional yardage.

17 Hybrid 230

This option might also let you select an addition wedge (scoring iron).

Thank you Tony.