Refinanced 11/17 & paid points but never claimed it. Do I need to go back and amend the 2017 with points paid or can I just claim it on my 2018 taxes?

I didn't claim my new mortgage and points paid in 2017 because I never started paying mortgage until 2018. Also, got 22000 back on this refinance and used 3320 of that for home repairs and rest on other bills/credit cards. Not sure how to claim all of this and if I need to amend 2107 or if it can just go on 2018 or if I do both??