LFH, I think you are doing a fantastic job. I can't imagine having to put up with a WAW while waiting for the retreat to get here! I have heard great things about it, so I think your wait will be well worth it.
It is not about what you feel should work in your M. It is about doing the work that gets the right results. Do what works!