You forgot at least one permanent companion: the Dark Brotherhood Murderer. One of them even sells exclusive spells only available from two merchants in the entire game. (I'm not sure if the Fighter's Guild and/or the Thieves' Guild also offer companions in their postgame state.)