[aedon]

i dont like the honeycomb either, but there are apps that rearange it in a row like fashon.

I can post it if youd like.
If you do have a spare phone like you mensioned, then maybe you could try out a different rom with different thing just to see what you think of it.
Worst comes to worst you can just go back without effecting your good phone