^Indeed.
What clubs I would suggest is the ATVs at 38/39 or the L41/42 Pings (you're only 2-3 levels from that), and perhaps K15s or wait until 55 to get the G20s (its lower for a limited time, usually it's 58-59), and get the L35 Ghost Spider Putter. I used it until just today. And remove the hybrid for a 3rd wedge.
The K15 PW goes 105, so these would work for wedges: Ping, 54, 60, 64; ATV, 56, 60, 64.
The G20 PW goes 115, so for this it would be: Ping, 52, 58, 64; ATV, 54, 60, 64.