I won't worry about Canada GC anymore because your US 485 is pending. You'll get your US GC eventually, shouldn't be too long. I decided to give up canada GC before landing, when my I-485 was pending 2-3 years ago.