Personally, I would go with dragon tail over waterfall. You're doing a bit less neutral DPS in exchange for slightly better EPS. Plus, DT will (in my opinion) be more relevant due to the presence of dragons in both the great and ultra tiers. If you're looking for a water specialist, Blastoise has been my personal favorite.
As for Tyranitar, fire blast can function as a nice backup option as a second charge move, but if your t-tar only has one charge move, I would TM it to either stone edge or crunch.