In this paper we combine partial-wave (`modal') methods with a wavelet analysis of the CMB bispectrum. Our implementation exploits the advantages of both approaches to produce robust, reliable and efficient estimators which can constrain the amplitude of arbitrary primordial bispectra. This will be particularly important for upcoming surveys such as \emph{Planck}. A key advantage is the computational efficiency of calculating the inverse covariance matrix in wavelet space, producing an error bar which is close to optimal. We verify the efficacy and robustness of the method by applying it to WMAP7 data, finding \fnllocal=38.4 \pm 23.6 and \fnlequil=-119.2 \pm 123.6
