Current harmonics via FFT -- do peaks matter?
You can interpolate the FFT bin results to get better estimates of the actual peaks in the spectrum.  Use a high quality interpolator, such as a windowed Sinc kernel.