You can either deduct all your points in the year you paid them (you can amend 2017) or deduct them in equal increments over the life of the loan. Either way, you'll need to itemize to get the deduction. Can I deduct points?
You can claim the interest paid on the principal amount in 2018 up to certain limits. And you can only claim the interest on the portion of the $22,000 that you used to substantially improve your home. Deducting mortgage and home equity interest
If you refinanced -
https://ttlc.intuit.com/replies/5759630
If you need to amend, you can use this link for instructions.
