Excellent, do you plan on posting a schematic.
For ideas on the wasvemaker, you may want to have a look at
http://www.globaldialog.com/~jrice/diy/wavemaker.htm
It is NOT based on the usual 555 circuitry most wavemakers rely on. This design allows dead time between switching powerheads.
-=Bryan=-