Placemenr of Windows-2012 Active Directory FSMO Items on Domain Controlleres

Sorry for the high request but we are cutting over to a new AD Sunday morning and I just ran into an odd complication here.

We are in the process of upgrading from 2003 to 2012R2 Domain Controllers and have both of the new 2012R2 controllers running and in the domain with integrated DNS. The FSMO currently looks like this:

FSMO Roles in UAT
C:\>netdom query /domain:CNXUAT.com FSMO
Schema master               cnxuatdc01.cnxuat.com
Domain naming master        cnxuatdc01.cnxuat.com
PDC                         cnxuatdc01.cnxuat.com
RID pool manager            cnxuatdc01.cnxuat.com
Infrastructure master       cnxuatdc01.cnxuat.com
The command completed successfully.

Miocrosoft KB https://support.microsoft.com/en-us/help/255504/using-ntdsutil-exe-to-transfer-or-seize-fsmo-roles-to-a-domain-control says:

"Do not put the Infrastructure master role on the same domain controller as the global catalog server. If the Infrastructure master runs on a global catalog server it stops updating object information because it does not contain any references to objects that it does not hold. This is because a global catalog server holds a partial replica of every object in the forest."

SO would I set up as follows? Global Catalog is on both new and old Servers now so I'd remove it off newdc02 before the next steps?

Schema master               newdc01.cnxuat.com
Domain naming master        newdc01.cnxuat.com
PDC                        newdc01.cnxuat.com
RID pool manager            newdc01.cnxuat.com
Infrastructure master      newdc02.cnxuat.com