For option B, the ABR routers must change the next-hop of MVPN AD routes to be the ABR systemIP or the loopback IP for core diversity. Currently, the next-hop-self BGP command does not change the next hop of the MVPN AD routes. This functionality will be available in a future release.
In the meantime, a BGP policy can be used to change the MVPN AD routes next hop at the ABR.