The Bulky Water set looks good. I expect Gyarados to decrease in usage because of Nattorei/Doryuzuu so no HP Electric is fine.
I think the Life Orb Tank is still viable though, I don't see why not. It would need a fancy EV spread or something though. Rest/Talk is a no brainer as well, with 252HP/240Def/16SpD, Calm, Boil Over/Dragon Tail/Rest/Sleep Talk.