I passed the skills test!!!
Navigation, diversion and the upper airwork sections all went very well. For my PFL I did the checks well and would have made the field but my choice of field was not great and the examiner pointed out a lovely disused airfield if I had looked for it. He thought the PFL was OK for a pass at PPL level (he said it would not have been a pass on the CPL skills test.) but advised that I practice this to get it to a higher standard, which I definitely intend to do.
I'll have a look for that book you suggested.