The Scene:
Old work bathroom remodel. GC has it down to the studs.
I'm keeping the existing circuit for lights and fan. 12/2 NM, no grounding
I've pulled a homerun 20a for receps.

How to ground the lights and fan?
A. There's a bare 14ga conductor that was bonding all of the old metal boxes. It is clamped with a grounding electrode to the bathroom's water pipe. This wire then continues off to other parts of the house. I could tap into this. But! Code says bonding to water pipe has to be 5' from source. This seems like a 'better than nothing' option. My least favorite so far.

B. Connect to the grounding of the new 20a circuit. This goes back to the panel and straight to the rod. Problem- I scoured the code and couldn't find an allowance for this.

C. Connect a new electrode and ground the lights and fan to the water pipe.

D. Run 12ga grounding wire all the way back to the panel. This is okay code wise, but raises some new issues.

What's best here?