Astarion is irritating

It's just my opinion but I am not a fan of the vampire. How do add lock picking and trap finding to different companion?