OP: I do carry a minimal set of tools with me. Probably not everything to fix every possible situation After the problems surfaced again, I did ride back to the shop 3 different times, in 7 days, to have it addressed. Unfortunately, these issues would start popping up after I was 25 miles into a 60 mile ride.
I don't know what "manually trim the FD" means. Time to check the internet on that one. I had the small chainring replaced, then the big one, after about 3 weeks. Pretty much, during the time I was having this problem (after the 10sp chain went on), the bike had a complete overhaul, I think , in part, to address /fix the problem that eventually got fixed when an 11sp chain, big chainring were put on. Everything settled down after that.