build direction advice

[TheGuyYouKnow]

so ive got this old human bardbarian 16bard /2barbarian /2rogue with an esos and he did pretty well even before the bard updates but its probably time to change his build to get a bit more out of it but im not sure what to go with

i could
tr into pdk warchanter with esos with high freezing dcs
or pdk warchanter with shortswords
or a proper swashbucker
or something else

tldr:should i ditch esos for swashbucker? should i ditch human and go full charisma to damage pdk?

ps. i do have the swashbucker shield, it still seems to be the most useful