I had the same issue last night. (in fact I was refreshing this thread hoping for a response).
I ended up sorting things out by using the CWM removal tool found here:
http://www.etoile-laconnex.com/CWR-removal-rootsafe.zip (credit does not go to me, but I am not sure who made it)
Put it on...