I've been using GO Launcher EX. I removed Sense, installed Ziggy's kernel, and installed ThaIconUltimate to change all my icons. It was a little sluggish at first, but it's running silky smooth ever since I flashed Ziggy's kernel.
In the screenshot attached, you'll see I have 5 icons across the bottom row, then 5 columns x 4 rows of icons on each screen. GO Launcher lets you customize how many rows/columns you'd like to add.