I would never top off with water.
If you are using a plastic Better Bottle carboy you can buy a small ratcheted cargo tie down strap, wrap the strap around the bottle several times, then ratchet it down until the wine level is where you want it. Only do this if you need to raise the level a cup or two, you don't want the Better Bottle to look like a coke bottle.