You can force a boot device using something like bd=dh0 in bootinfo.txt. That ought to make early startup wait for volume to come online. Mind it cannot be the volume label.