I recently added my 3-iron back, and removed the 3 hybrid that was somewhere in the middle of my 3 and 4 iron. For that, I put in a 2-iron hybrid 17* that has been fantastic.
I think you'll like the utility of that hybrid over a chunkier wood. I've found that even some knock-down type, punchy shots with my hybrid will give me a whole different bucket of shots. I'll use that club, choked down alot, and 3/4 swings all the way down to 180, and be able to dial it in.
How long is your shaft in the hybrid? I think mine is 40.5... if I'm not mistaken.