@height8 I think I got lucky. The iMac updated to 10.11.4 without any problem. I'm now waiting for the rMBP.

//