As far as I know(also as I did), as long as you've stayed in US for more than 1 year, you don't use 1040-NR. 485 doesn't matter here.