I'll close this now, feel free to open a thread on the forums when needing similar advice:

• https://forum.hibernate.org/viewforum.php?f=9