I am so sorry. I must have misread your post. Like you said, its been a long day.
Download the latest nightly (should be 32), the Gapps zip (Google Apps so you can sign into your Google account and use the market), and the all in one fix for the camera/torch/battery. There is also a GPS fix that you can download and flash.
Go into Clockwork and wipe data, cache and dalvik cache. Then flash the CM7 zip. After that, flash the Gapps and All in one zips. Then reboot and you are good.
Sorry about the confusion and let me know if I need to clarify. Good luck.
CM74DX