One might consider sticking with a longer-duration mortgage and paying extra each month with 10-yr mortgage. This is because the monthly payment on a 10-yr mortgage will be significantly higher than others. One can pay more toward your mortgage principal with every payment. One can also opt to make bi-weekly mortgage payments.
Market Update