If your router supports it, you may be able to use the dd-wrt
http://www.dd-wrt.com firmware and configure it as a repeater for your phone. I have done this with other wireless access points, but never tried with ad-hoc.
If it works you can save both types of configurations to a file and load as needed.
I may try this idea too.