I have the correct 17mm injector and fuel line wrench coming from ZDMAK Tools so I can leave them clamped together in the future. That was a real waste of time and I won't repeat it again. On my 1.6 I test the glow plugs by removing the injectors and just looking at them; being able to remove the fuel pipes as a unit is part of the process.
A big "thank you" to the guys on this site for the recommendation to rotate the injection pump away from the head and perform the pump timing with the camshaft sprocket. It leaves plenty of room to access the injectors and just enough room to get at the glow plugs. This post #16 from v8volvo is the BEST description of how to perform the pump timing:
http://www.d24t.com/showthread.php?t=930&page=2