Split up the settings for my OSX user between two users during initial setup

[Dequanizatifici]

I'm switching from Windows to Mac. Last night I received my Mac in the mail and started to set it up. I installed the Migration Assistant on my old PC and couldn't get it to work, so I finally gave up and just exited from the Migration System on my Mac. At this point I had one user on the Mac which OSX created for me as part of the initial set up process; call it "User A." User A has the username, etc. that I wanted.

Later last night I managed to get a limited migration working from Windows. I couldn't transfer everything (the connection between the two machines would break before long) so I just transferred the stuff that I thought would be complicated, e.g., the contents of my calendar. Unfortunately, the results of the transfer ended up under a second user; call it "User B."

So User A is set up the way I wanted but User B has all the files and settings that I would expect to be painful to migrate. I think I have a couple options:

1. Continue to have two users forever. Presumably I can do better than this.
2. Delete User A and then modify User B to behave the way I want. It sounds like renaming one's home directory, etc. is possible but the city fathers recommended against doing so ("Although you can change your Home name in Mac OS X v10.3 or later, you usually shouldn't"--http://support.apple.com/kb/HT1428).
3. Delete User B and just do all the migration from my PC manually. Unfortunately as a new immigrant I don't know my way around OSX ("This procedure requires strong Intermediate to Advanced Mac User skills."--http://www.cultofmac.com/45114/how-to-perform-a-manual-mac-system-migration-macrx/). Migrating stuff from User B to User A sounds similarly complicated (http://pondini.org/OSX/Transfer.html).
4. Somehow delete both accounts and start with something approximately a factory state. There is plenty of advice floating around the internet about how to do this (https://discussions.apple.com/message/15701551)

Is there a better option that I'm missing here? If not, which of 2-4 will be the easiest for someone who's computer literate (including experience with Unix) but new to OSX?

 

[inscrewtable]

It's a good idea to have two users anyway. Make yourself a non admin user and have the spare user set up with admin privilleges. Good for trouble shooting and adding an extra layer of security between you (the non admin user) and the world.

 

[snberk103]

It's a good idea to have two users anyway. Make yourself a non admin user and have the spare user set up with admin privilleges. Good for trouble shooting and adding an extra layer of security between you (the non admin user) and the world.

I second this advice. I actually name the 2nd Admin user "Trouble" as a way to remind myself to only use it to troubleshoot. It is also better to leave this Admin at all the defaults. So don't customize the desktop, etc etc.