I have a fix for this here: https://github.com/hibernate/hibernate-orm/pull/2190
I'm still waiting for this matter being discussed on the mailing list. Could you test it and give me feedback? I hope this will be the last problem. The code in the PR reverts back to non-determinism in some edge cases like before.