I think Peak might be the answer......
Got to try one for a couple of hours today. Sounds lovely, has FM and some Wave table (if not brilliant) stuff. 3 Oscillators is better than the Rev 2's 2. Compared to the REv 2, the Peak has less FX, but they can all be applied at once (the Rev 2 only has one FX per voice).
The only real dowside compared to the REv 2, from what I could see are:
1. Modulators....The Rev 2 has 4 x LFOs and 1 x Env. The {Peak has 2 Env but only 2 LFOs - one of which is hard wired to the Osc Pitch mod if want to use that).
2. Mod Matrix - The Rev 2 allows modulation of FX parameters, the Peak doesnt.
BUT - heres the kicker. Ive just spoken to a Beta tester for Peaks FW update. The new update adds the ability to Modulate FX parameters, AND adds 2 more LFOs (so 4 LFOs and 2 Mod Envelopes) as well as a much more in depth wavetable selection. Add in the FM on the peak and the £100 lower price tag (recent drop over the last week) and its looking VERY tempting.