I'm not sure what to suggest from here. I think if it were me I would try installing efi manually. just to be on the safe side.
Did you manage to get 10.5.1 running on your setup?