Beat mapping old school disco and funk

I play a lot of classic disco/funk/soul in my sets and the BPM analysis and beat grid are always off because the rhythms are not machine generated. Is there a way to quantize the music better during track analysis?