If you can, run a new homerun from the panel to the service point. Proper grounding should always be used. However! The GFI monitors the neutral so it will work, if an inspector uses his tester it...