Well, I'm not convinced changing the behaviour would help to improve the situation. 1) nvidia nomodeset doesn't hurt afterwards when switching to NVIDIA driver unless you want to use the experimental modeset feature of this driver, which needs to be enabled manually (nvidia_drm.modeset=1). Otherwise you need to use fbdev driver anyway unless updated kernels fix the issue with modesetting in nouveau driver, which is unfortunately unlikely. 2) AMD nomodeset is also still needed afterwards (fallback to fbdev driver) unless an updated kernel fixes the issue in the radeon/amdgpu driver, which doesn't happen often. 3) Optimus Long, sad story. But easiest workaround is still disabling NVIDIA GPU in BIOS/Firmware (if this is possible). Otherwise disabling nouveau driver (kernel module) completely should help. Which means intel only. Things are improving a lot with Optimus on TW when using NVIDIA driver. See bsc#1103816. But in that case you disable nouveau driver anyway.