Dillution is not a good option for heavy smokers. That works best for light smokers. Both of your's best bet would be subbibg with synthetic urine. Most people here use QuickFix. Its easy to use, nuke for 10 seconds then stuff it in your shorts to keep the temp between 90 and 100.