How to fill a gap
TheSandTrap.com Top Picks
Club maker reps would say to avoid the 17* / 2H unless you generate quite a bit of clubhead speed. Otherwise, you might find it hard to hit out of the rough.
Note that the 2H clubs normally have Pro or Tour head designs with low offset.
As for distance, an 18* or 19* 5W might give you more distance due to a longer shaft. Any chance you could hit the 2H and 5W side-by-side and compare them?
If you swing flat, the 5 wood is probably easier, upright and the hybrid is. Some people love fairway woods and some love hybrids. I'm the latter. If you like your 3h than by all means a 2h is a logical choice.