Hmm, as a last resort you could get
OHS. This is a mod that allows you to create your own henchperson (though you can't pick skills, feats, etc. for them when they level up) and use them in addition to or instead of the normal henchperson(s). Just get any item off your henchman before you enter Luskan (assuming you use the Henchman Inventory & AI mod, which you should) and use OHS to create one of your own liking.