Yeah I went with the option 2 and inflated the points to match with what I paid in closing disclosures. After that the calculation turned out right. Thanks for the suggestions
