For the warlock, just allow him to change any spell that is Ranged 10, Target: one creature to Melee touch (perhaps as a feat option allowing him to switch between thet two?). Hide Armor + high Int is only about 2 points less AC than someone in Full Plate. Getting Concealment whenever he moves...