What's worked was improving set of irons and as distance between them and hybrid was the same, I removed Hybrid and included a third wedge.
I used to have:
* Taylormade Rocket Bladez (Graphite) (L15) Iron Set (Shoots 200 to 110 yds)
And I still have and I find them really useful:
* Ping Tour Wedges 64-60-56 (L41-42) Wedges (Shoots 90 to 60 yds)
Meter can be fast, but once you get used to, they are really a good upgrade.
Regarding putter, I got
* Taylormade Spider (L19) Putter
which worked fine for me for quite some time.
Hope it helps
Martin