If I were in your shoes I'd get the Callaway driver and irons that unlock at L85, and the Callaway 3W that unlocks at L86.
I'd also drop the hybrid for a third wedge; there are a lot of wedges to choose from and exactly which ones you prefer really comes down to personal preference - just make sure that whatever you get, the distances fit in logically with the distances of whichever iron set you end up choosing.
I really like the putter you have; unless you hate it for some reason, I'd keep it for awhile.