It appears that OVMF r14423 which I've compiled just now (after I discovered that I wasn't on the latest OVMF as they'd move the svn repository) no longer causes the kernel to oops and seems to make efibootmgr work properly.