Motorola Defy getting stuck at boot menu

I successfully installed CyanogenMod 7.2 on my Motorola Defy MB525 using the instructions from here . After a while, I wanted to install gapps, so I installed it from bootmenu. After this, it was always booting to boot menu and I didn't know how to make it boot into the system, so I changed the "Boot" option default to something like "Normal", I think. Now when starting the phone, all I see is the Google logo which stays there indefinitely. I can still boot to bootmenu and tried a number of times to wipe data/factory reset, wipe cache, wipe dalvik cache, and re-install the CyanogenMod 7.2 zip, but it still can't get out of the infinite loop. Any ideas?