Yes, you should put both on your tax documents.
For points or origination fees on a refinance they need to be amortized over the life of the loan unless the points were used to improve your main home.
You can find directions to enter those points and other information about the refinance of your home using the directions below:
Open (continue) your return in TurboTax.
In the Search box, search for 1098
Click the "Jump to 1098" link in the search results.
Follow the on-screen instructions.