I think I've read on the echonest board that the most common solution is to index multiple pitch variants of the same songs. Apparently that's what Shazam does.
Also the guys from Trax-air.com are doing something pretty similar to you guys but with pitch/bpm bending support.