For 3.5 I'd say "some social ability + swordplay & tricks" (read swashbuckling) = Swashbuckler from Complete Warrior. You have 4 skill points per level, full BAB, Weapon Finesse, Bluff, Diplomacy & Sense Motive as class skills. Feats to look for: combat expertise, improved disarm. He's lacking...