If you drink all that water it will just dilute you and they wont be able to test with your sample.
I would def recommend getting the quick-fix....if it is in 24 hours, you have plenty of time to pick one up. Just make sure you have it at proper temperature.
If it is for pre-employment you will not be watched, so fix should work.....