Hi Bridghid,
Have a look at this analysis I've prepared for you. It goes over all the cost/benefit over time of your current mortgage strategy compared to some new refi possibilities.
I'm happy to answer any questions you may have, but this is something that I think we should do provided your tax returns can be acceptable!