Stock Froyo spin offs are slightly better than stock /GB spin offs which are slightly better than CM7.
How you use it and set it up will have a greater impact on battery life.
It sounds like WiFi will be a big battery killer. In this case you should look into lowering the WiFi TXpower to something like 15 or 20 dbm. This has saved me ALOT of battery and is better for your health!