Also, drain you water heater and catch some of the water coming out and see if the smell is worse there. I've treated mine with Sodium Di-Chlor for the last two years and this year with bleach. No more smell with either of these.
2012 Sandpiper 365SAQ weighing @ 15k, Onan, 2nd air, slide toppers, TST
2013 F350 6.7L Lariat 4x4 CC DRW,Viair 1007, Ride-Rites, Edge CTS, B&W
2001 Chevy 3500CC DRW 4x4, 8.1L, 4.10 gears w/ Detroit TrueTrac
2001 Ford Excursion Limited 4x4 7.3L,V/B Spring Mod, ProComps, Hellwig Swaybar, & other 'Necessities'