If you get the Yorkie he'll probably fall in love with him/her just like a lot of macho men do!
And, I do think that his fight was more than "just" about the dog. I've learned that men hold stuff in until there is a big fight and just let it all out! And that's what he did to you...talking about spending and such. I'm not saying get counseling, just talk it over with him.
Good luck!