I can second the Golden Age Restoration tuners. I had a set installed on my D12-20 after I bought it for purely cosmetic reasons, there was nothing wrong with the old Waverlys. I would say both sets are about the same in ease of use and ability to hold the tuning.
Welcome
Harmony H-173 bought in 1960 (retired), Alvarez AC60S 2008, Eastman AC320ce 2009 "Hybrid", Guild D25M 1974, Martin Grand J35E 2009, Martin D12-20 1970, Martin OM-21 2009, Martin 00-15M Custom (full body gloss, wide neck) 2011, Martin 00-15M Custom (12 fret, wide neck, solid peghead) 2012, Voyage-air VAOM-06 2010
"I'm glad there are a lot of guitar players pursuing technique as diligently as they possibly can, because it leaves this whole other area open to people like me."
Richard Thompson