Just incase anyone else has the same experience of breaking the headlight removal tool. Mine arrived the other day, costing me £15.22 delivered to my house, from;
www.porscheshop.co.uk
It is the genuine Porsche version, identical to the one that broke in all respects. However, you can do exactly the same job with a 5mm nutspinner from any tool store, which would be cheaper. Hindsight is always an exact science!