In 2017, when you decided to stay in VA you should have changed your DL to VA and break ties with NC. For 2018 I would consider you a VA resident only so you do not need to file NC any longer however you really need to get the DL changes asap.
