Hi @eddie.canales,
You may have found a solution using the Classic UL experience, but I just wanted to provide an update that the Identifier First + Home Realm Discovery for New UL - GA! feature is now available. This functionality sounds like what you are wanting to achieve.