Not a warlock player myself, but wouldn't Wyll's issue be moot once Pact of the Blade is introduced? You could add on top of that a Paladin multiclass and he should be fine in that regard. It's not like you need to play him like a melee fighter, more in a skirmishing role, finishing enemies off with the blade.
