The best way is to stay with the current company because you do not need to do anything and just wait for your GC. Changing location does not affect your GC application if the company name is the same. Please ask Mr. 8 or Mr. P to confirm this.
Otherwise, you need to start over your GC application but carry over the PD. Your GC should be an inch away.