Starting at 1st level, I wouldn't change a whole lot. I might play a little carefully, since base Rogue doesn't handle melee as well as Swashbuckler. Other than that, it would pretty much go how I had it above, unless a story opportunity presents itself for you to go Warlock early. Maybe a...