Well, on the waveshaper thing...I'm not quite so jazzed by the Doepfer stuff here. It's basic, inexpensive...but rather simplistic when compared to a lot of other possibilities. The Tiptop has the ability to throw two waveforms at each other via its dual inputs, plus you also get a suboscillator divider...this is similar to Antimatter's Crossfold, albeit considerably cheaper. Also, that new Intellijel Bifold is pretty attractive...it's similar to the Tiptop in some ways, but it offers a CVable crossfader to shift between timbres.
But don't neglect a few others if you can cram 'em in...most notably Random*Source's Eurorack clones of the Serge TWS and VCM, Dannysound's DIY clone of the Buchla 259's timbre section, Bastl's Waver which offers wavefolding AND VCO mixing, or Circuit Abbey's Gravity Well, which does what they refer to as "asymmetrical" wavefolding. Nice stuff...just depends on what space you've got plus which sort of "school of thought" you'd like to follow as far as the circuit's concerned.