Why are you swamping yourself with "gallons of water". If you know that "THC stores in the fat cells" you should also know that you cannot simply wash or flush out those fat cells with liquids.

You are already doing all you can do to expedite the process. Abstention, time and strenuous excercise.

Best of luck in meeting your timeframe.