Interests are so low now it may not make any sense to pay points to cut your payment down by a few bucks. Remember, the lower the interest you pay, the lower your homeowner deduction is. I encourage you to take a shorter term if you can afford it. Now's the time to take advantage of the market by cutting your interest paid to the banks. If noting else, send in those extra principle payment.
Also, make sure your doing the best loan for your set of circumstances. I can't tell you how many times I hear someone did a FHA loan when they could have done a USDA. The savings just in monthly mortgage insurance could have your hundreds of dollars and thousands over next several years and the USDA requires no down payment and delivers a lower monthly payment.
Best of Luck!