Prior to ICS, I used Go Launcher. I liked it better than 2.3.6 but I'm kind of digging ICS a bit more. What I didn't like about the GO launcher was the squished screen (from top to bottom) while going through your apps.
That said, those that have upgraded to ICS, what are you using now? Stock? GO? Something else? Do tell.