Hi Rodrigo! Expect a fix soon, something along the lines that you propose. Thanks a lot for your detailed description and for the reproducer.

There is a workaround for this kind of use cases, that is to set the mappedBy value in both sides of the association. You will absolutely need to do that if multiple types match.