I usually refrain from saying one thing is better than the other, but here goes; in a few short months, your attitude towards resolving conflicts (of any type) will be greatly improved with aikido training. It is one of the first things that changes in you. It forces you to acknowledge that you dont have to win or someone has to loose to resolve a conflict, and after a while people around you start to sense that. It's almost like a sense of self-confidence without the ego factor. I sometimes use the word benovelence (spl?). Combine that with the ability to physically handle the attacks, and you have a collection of powerful tools at your disposal.
Good luck. Keep us posted.