Nice, I'm glad it worked :)I wonder what the difference is between having those commands in GRUB_CMDLINE_LINUX, and not having the commands but removing /boot from fstab.
The weird thing is that I don't have a /boot entr in fstab, only /dev/mapper/main and /dev/mapper/swap.