The real issue is that the different options have different break-even points (the more points you pay to get a lower rate, the longer the break-even), so your decision almost entirely depends on how long you plan to keep the mortgage.
For example, I recently refinanced too. I plan to keep my house indefinitely (even if I move, I'll keep it as a rental) and I don't expect rates to continue to get lower causing another refi to be unlikely, so I decided it was worthwhile to pay down the interest rate.
You say you hope to stay for at least a decade, and if you actually do that then paying down the rate might be worth it. But you have to ask yourself honestly how likely it really is that you will neither sell or refinance before break-even. On average, most people move within 7 years, so on average, it tends not to be worth paying down the rate. Are you the exception?