I would certainly recommend Oxygen 2.1.4, but Cyanogenmod 7 was pretty slick as well. If you are up for something a bit more daring, do Oxygen with a cMTD table, ( it's actually pretty safe, all the stuff is temp) and you can get a ton more space in your /data partition.