Who don't you change the GRUB root volume to use a UUID? Then you won't ever worry about device numbering/naming again.