I'm setting up my bag with 3 wedges @ 48/54/60, 2 woods; the driver, and strong 3, and a hybrid @ 17˚. The gap wedge was never appealing to me, I like my 3 iron, and I dislike fairway woods and hybrids enough to limit their use in my bag.
Personally I think it's the best bag setup for me. Your setup is pretty decent as is, I'd drop either the 4i or the 3h depending what you hit better, and even consider going 50/56/62 if you really want to spend your money. You're an 18 index, you don't hit your long clubs well enough to need like 10 yard gaps over 200 yards. If you're trying to be that specific on your yardages for hitting par 5s, so you don't have too long an eagle putt, think you better choke up on the 5 wood you seem to like so much.
Believe me though, you're overthinking it. That wedge is going to be useful for you, the hybrid is the same damn thing as the 5w basically. You could use your 5w all the same from rough on long holes and choke up an inch for the different yardage. See if you can even trade for a 4h if you really want an open spot, then drop the 4i and add the wedge if you wish. Remember you can swap the club out for certain courses if need be.