Marry the house,
date the rate.

The refinance here runs for the years left on your original 30 rather than restarting the clock, so you never give back the payments you have already made. Closing costs of about 2% of the balance are included and assumed rolled into the new loan. Actual costs and available terms vary by lender.