Why I don't have a problem with the companions we have now, I agree with some here, that Wyll should change class. Everyone is referring of him as the Blade and he is always bragging about his rapier skills. That just does not mix well with the warlock class. I would adjust his back story, that he na be made a deal with a demon for talent or something like that and make him a fighter or rogue. Astarion could as easily be the warlock, it would not change anything about him.
