The solution is to amend 2017 and 2018.
I would have the client decide whether to go back to prior preparer to have it done and possibly pay any penalties or interest involved in additional tax due OR pay you to correct the errors and do the amended.