Optimal ways of deducting mortgage/refinance point cost?

I purchased my first house in 2018, with $5800 for points. Then in 2019, I refinanced it (no cash-out) with the same lender (they sold the loan to a different lender for two months before I refinanced back with them), with $3000 for points. And as of this year, I refinanced again to a different lender with no points purchase.

 

For the year 2018, I didn't use itemized deduction thus didn't make use of that $5800.

For the year 2019, I did itemization thus used the spreading method to deduct 1/30 of $5800+$3000.

For the year 2020/21, I'm planning to follow the above.

 

However, I read about the acceleration of points deduction when you refinance, so you could deduct the entire points cost after refinance, which makes me wonder if I'm taking the best way of utilizing this $8800 point cost for this year or next year.

 

Can anyone shed some light on this topic?