Firewall Forward

In order to provide a better run for the hose bringing fuel to the fuel pump, and to make room for the control cables and exhaust hangers, I would like to replace the 90 degree fitting (center of picture) on the input side of a the fuel pump with a 45.

Rotation of the fitting is blocked by the constant speed oil pressure unit. This leaves me in something of a quandary as to which unit is easier to remove in order to replace the fitting.

If I take the fuel pump off by undoing the two Allen Key studs, will the unit in fact be removable? Remember on a -4 there is almost no room between the fuel overflow takeoff on the back of the pump and the firewall, as you can see in the picture. With the studs removed does it slide off backwards or could it rotate downwards?

The alternative is to remove the entire constant speed unit. Yes, only 4 nuts, but some are very hard to get to, at least with my fat spanners and the poor access behind the engine.

Postscript 1/12/07 - Today I took the constant speed unit off having been advised the fuel pump was not going to be easy. To get the c/s unit off I had to take both mags off. It was clearly the right way to do the job, I had the 90 degree fitting exchanged for a 45, and everything was back together in 80 minutes.