I think it's better to file 485 since you can enjoy EAD with a pending 485, but you can still live in Canada since you are in US when you file your 485, maybe just use your employer's address as mailing address? I believe you are not alone. since many people commute between US and Canada