I think Larian is actually planning to let players tweak the companions they hire to let them be a different class (and possibly allow full customization except for name and gender).