Since version 0.95, grub supports booting a cascade of fallback kernels if the default kernel doesn’t boot correctly:
Gentoo Wiki: HOWTO Remote Kernel Upgrade
Grub manual: 4.3.2 Booting fallback systems
I hope it will work when needed..
Make a diff!