Glad its working out for you. Do you have any flickering / dropout issues with 5700XT?
Most rev2 kits shipped only with 4k120/1080p240/720p360/960p480 modes, while most rev1 kits had
4k120/4k60/1080p240/720p360/960p480 . For 4k60 on rev2, need to change edid or use a software override from a single-input mode.
You should be able to leave both DP cables plugged in and use the monitor's mode switching to switch. The secondary input is hotplug-removed when in a single input mode, so it should be no different than physically unplugging the DP cable.