You forgot the cold villian type who still has some emotions left that is usually bought out by the lead or some supporting character in battle or constant annoyance(*cough* usually referred to as friendship)
There are lots of examples:Toguro the younger,sensui,Robert hayden(ueki),sesshomaru(who we can see gradually growing softer after taking in ren)
Hiei(to some extent)