use wavelet for improving spectral resolution
The window shape chosen for your wavelet basis will generally only have a slight effect on frequency resolution.  To increase frequency resolution more, increase a scale factor that is related or proportional to the window length for a given frequency.  This will also decrease temporal resolution.