So, I noticed that there was a new version of FOP2, ver 2.31.21 that came out 17 December 2018. I have installed that and it seems to have fixed my issues.
I haven't yet had a chance to give the system a full live workout, but it is now handling scenarios that were consistently breaking it on 2.31.20 - so I'm feeling optimistic.