If anybody doesn't want to wait for this to (maybe) get fixed, in another thread regarding the same issue a user suggested a pretty reasonable work-around. Just use a different broker name for each transaction, so that there is only a single ESPP transaction per broker. E.g. you can use Schwab 1, Schwab 2, etc.
