I would agree with you on both those points, Keith Moon was too over rated and Buddy Rich was probably the best. Although I prefer to hear good drum parts integrated into songs so I'd have to say Steve Gadd.
YouTube - Paul Simon - 50 ways to leave your lover