How long until you have your 30 year paid for with the extra payments?
Generally if you still owe over 15 years, it may be worth it. Just run the numbers very carefully.
I personally would sit down with a very trusted financial advisor and discuss your specific situation as everyone's is different.
In our case, we looked at all options and ran the numbers and reviewed the results with our advisor. We have decided to refi back into a 30 year note for a mutitude of reasons. My wife is back in school looking at a grad degree and we have three kids near college age. We are doing a cash out refi that will put us at 74% LTV and investing the cash into our investments and to have a greater cash reserve on hand. Plus, I am paying off all debt that we currently owe besides the house.
As for the HELOC, we have one at 30k with only $1000 used and I have to reduce the HELOC to $15k as a requirement of the refi. My credit union has agreed to do this because of a part of the HELOC contact that stipulates that it is based upon the value of the equity remaining in the house. There were no fees associated for this with mine. Best advice there is to read your contract agreement for the HELOC.