RDS Setup Question

Someone setup an RDS server for trial in domain environment which is due to expire within 30 days.  It was setup using the QuickStart option where it installed all the roles  (RD Broker Connection, RD Session Host, and RD Web Access) in one server called SERVER1.  The RD Licensing Server was never added to the deployment server.

Here is my question or what I need help with
A second RDS system has been setup.  It was configured with 2 servers (RDBroker, and RDLicense).  The "RD Broker Connection", "RD Host Session", and the "RD Web Access" roles are running on the RDBroker Server.  The "RD Licensing" is running on RDLicense Server.  The License is configured and activated without any issues.  We have successfully created a collection and linked it to the RD Host Session on the RD Broker without any issue.

Can we add this new "RD Licensing" Server running on RDBroker to the Old RD Broker DEPLOYMENT SERVERS?  Can the new "RD Licensing" server with User CAL type be able to licence both RD Brokers?  There is a single "RD Session Host" running on each RD Broker.  It's all setup in a single domain /single forest environment.

Or should I uninstall all the roles from the old RDS and add the server as a second "RD Session Host" on the new "RD Broker" and configure and new collection for it?

Thanks