Went with your suggestion with 2 rogue...still seems like I'm going to be AP deprived (playing on Cormyr and only have 3 RP). Trying to see if I can still get heals from Shintao AND haste from Vistani.Honestly without Swashbuckling to prop up handaxes you may be better served with a light pick or a kukri.
I know the 1 warlock is likely for arcane warrior stacks but that's only worthwhile if you intend to park at endgame for a while, meanwhile a second level of rogue could get you 3 more imbue dice from assassin.