I would say you are on the right track. Ultimately time and exercise are what will help to rid your body of THC metabolites. In order to pass a drug screen for my job I increased my cardio workouts, running every day, went on a high fiber diet with lots of veggies, learned to love salads, and took metamucil capsules. I did not overdo liquids but stayed hydrated. I kept this up for 21 days before consistently passing at home tests. I was a daily smoker. On day 25 I took and passed my drug screen. I think from what I have read that you can exercise up to 3 days before your test then go into veg mode and eat plenty of fatty foods. Creatine will not hurt and will help if you decide to dillute.

I highly recommend getting some at home tests for thc. You can get them pretty cheap on line. That way you can test yourself and feel pretty confident of where you are at. If you are not passing 2 days before your scheduled UA, then consider dilluting. You can practice, follow the sticky and test yourself to see how you do. If you dillute, keep up your creatine intake and sub gatorade for water the day of the UA.