Thanks for the suggestions!
I will review the three suggested here, they were all on my radar, so I am hoping one will fit the bill.
I am working on my new lab network and storage. I have Truenas running well on a 6 drive z2 and will build out the XCP-NG server now - then the migration. I plan to setup whichever LDAP/IA server on the XCP-NG hypervisor.
Keep you posted!
Keith