You know what would be even better? Someone MORE EMO THAN HIM. Like. A grumpy teenager who feels sorry for themself all the time and the Doctor has to drag them around and tell them about the wonder of the universe in and eventually yell at them for being so self-absorbed.

I think it would do wonders for his self-awareness, actually :D