I say neuter him. I am very pro neuter and pro spay though because of the out of control pet population. That way no accidents occur.
But also, one of my friends have a male yorkie and he has become much better since his neuter. She was having a few behavioral issues but now she is not. I know she was glad she did it. My vote is neuter.