I think smithgd that's the best we are going to do for now and I believe most clubs are doing 1) on your list.
Just don't believe an instructor who tells you to log PIC U/S after a 'twice round the circuit' and make sure if you are going to log it as P1 that the instructor isn't logging anything.