Depends on how far you hit the ball. A 3W and a 5W will get you more distance, because the shafts would be longer than the hybrids. But, hybrids might give better control because of shorter shafts.
And, not all people are able to hit hybrids; some prefer FWs.
At a 36 HDCP, you could better make this decision if your swing stabilized a little. For now, you might try a 4W (easier to hit than a 3W) and a hybrid.
NOTE: Consider putting a "What's in My Bag" segment in either your Sig line, or in a list. That way we can tell which clubs you already have, and give you some better suggestions.