I spent a ridiculous amount of time yesterday morning reorganizing my iPhone folders into what, at the time, seemed like a perfectly logical system:

so logical!
.. naturally, I can’t find a goddamn thing. I don’t *want* to spend hours rearranging things again, so I’m going to suck it up and live with it at least until I get my new phone (I never did get around to doing anything to get myself an iPhone 4 on launch day; I couldn’t be bothered to .. you know, do anything about it. I’m on about 8 waiting lists; I’ll get one when I get one) since it’ll just alphabetize everything anyway (will it? it did last time, and it filled me with rage). There’s got to be a logical order for things that isn’t alphabetical – I’m sure it’ll come to me in the shower one day. In the meantime, don’t ask me to look anything up. I am all but useless.
Tonight I am going to watch hippies sing and dance! Hooray!

if you restore from backup it will leave everything the way you have it on your 3GS. So might as well rearrange it now.
You could just use spotlight to launch applications.
I do this already, but part of the problem with carrying 200+ apps is forgetting what you’ve got installed. Can’t go searching for it if I’ve forgotten it’s there entirely. :)