Personally, I would remove Swashbuckler from Thief and, between Fighter and Thief, I would include a light armor fighter class with the following subclasses: Brawler/Pugilist, Corsair/Pirate, Duelist/Fencer, Kensei/Swordmaster, Musketeer, Swashbuckler,