I discussed with Thomas and we came to the conclusion that it's safer and quicker for now to restore the old NVMe symlinks via scsi_id like it was done before. So we'll have more time to implement and test the replacement of scsi_id with the use of the sysfs attributes.