decommision resource forest and install Exchange 2016 in account domain with existing hybrid

I am working on a similar project with what sounds like an almost identical setup with the user/resoure forest and mailboxes have already been migrated to Office 365. We havent got to the stage yet where Exchange 2016 is installed in the user forest. My thoughts around the steps involved were as below:

1. Install EX2016 in user forest - Set SCP to null to prevent any Autodiscover funnys

2. Add Office 365 mail routing domain as remote domain in EX2016

3. Export Exchange attributes from resource forest account

4. Stop AAD connect

5. Remove resource forest acccount from AAD connect scope so it only syncs from user forest account

6. Import Exchange attributes to user forest account and run the new-remotemailbox command

7. Start AAD connect

8. Decommission hybrid from resource forest

9. Configure hybrid in user forest

I am plannnig to validate this process on a batch of test accounts first to see if any issues occur.