It is possible that a driver update might help resolve this situation. However, I noticed you are already running with the most recent version for your controller.
I do understand your concern about swapping the drive as your Volume 1 is optimal. Because of this, I would contact Intel Customer Support to expedite the resolution of your case.