If you are going to dilute, start taking a creatine supplement at least 3 days before your test. This will increase your creatinine levels in your urine, so you don't appear to be as diluted. The gatorade will help with the specific gravity.

QF is what I used, and passed with flying colors.

A thc hometest would tell you whether or not dilution or substitution is your best bet.