For now I just ended up going the dynamic update (as in @DynamicUpdate) route. Essentially any time you have an enhanced entity with more than one lazy group we will automatically enable @DynamicUpdate for that entity.

FWIW you cannot use that as a workaround prior to this fix due to a bug in the code that reads the group from the database. Essentially we over-wrote the setter value with the value read from the DB.