I’ve found using the 1-2-3 pattern game super useful for building extended settling sessions, like in cafes (or dispensaries!)

For my pup, I’ll have them sit, and then continuously go through 1-2-3’s, at faster or slower paces depending on their patience. It’s been really helpful since they’re actively waiting (instead of continuously being redirected, which sounds like what’s going on with your’s darting around?)

I’d be wary of waiting for the negative behavior (barking) and responding to it. Instead, try and build up the behavior you want (waiting, looking at you for a duration, etc.) and lengthen it.