Both ways should work fine or doesn't matter much. But if multi-vdom mode is not enabled yet, you might need to enable it first before configuring HA. That part I'm not sure if HA can follow when it's changed on the primary side. Somebody from FTNT probably can clarify that.
The Fortinet Security Fabric brings together the concepts of convergence and consolidation to provide comprehensive cybersecurity protection for all users, devices, and applications and across all network edges.