I'm no expert, but seems like azumarill might not be a bad idea, or gyarados, depending on your needs. I'd probably say why not switch tentacruel with gyarados, since you needed a defensive pokemon. Gyarados can run the waterfall/ice fang set with stone edge or something else as cover. Just...