Have you tried a integrator circuit using op-amps? since your range is limited (2000rpm-3000rpm), I think that you'll get a linear enough response from the op-amp.

if this is not linear enough, can't you implement a look-up table that you can use to feedback the servo circuitry?

HTH

orlando