kiwitrc: Uh Oh, I just assumed you were using 1.3 because of your signature, :) I will start again.
Just to be sure 2.1 or 2.1.1?
Sorry!! yeah, it's a bit out of date, mostly because Gorkhan is releasing about 372 beta's of his kernel every singe day!!
Definitely 2.1 (2.1.1 is only for people experiencing issues with 2.1). . . .when you grab it, also download the Superuser zip file which is linked right underneath; there'a an issue of some sort whereby you may lose root once you've flashed the ROM. If this happens, just reboot into CWM again, and flash the Superuser package from there, and you'll be good to go.