I have just found the 2x 10mm heatshield bolts on the top side of the subframe the biggest arse of the lot.
I do it the other way and just dissconect from pump, take off battery tray so you can pull the line up past it, and leave it all connected at the rack, and the rack attached the subframe.