I would amend the 2017 returns prior to doing the 2018.
The reason for this is that information is trasfered over from the prior years, so after the amending the 2017 return, you will start with the correct information from 2017 when you do the 2018 return.
