KJ, you've hit on one of the main advantages pipe has over cable; you can replace the wire without tearing the walls apart!

I agree that simply using a wire nut to attach a #10 pigtail to a #12 ground wire is the choice solution.

I think it comes down to not letting the 'best' become the enemy of 'good enough.'