I went the route of your first option. Our $EM_HOME is:
/ora01/app/oracle/product/EM
... with EM-related objects getting their own subdirectories beneath. After
the upgrade you listed the OMS is now under:
/ora01/app/oracle/product/EM/MW_12105
Regards,
Dave