Don, you're on the right track, but--
You're not using enough bleach to kill the critters (molds, fungi etc) in the plumbing, which are 90% of the funky water problem. Cleaning the tank only addresses 10% of the problem. For a 20 gallon tank, you need a pint of bleach. Turn on every faucet and let water run till what's coming out smells strongly of bleach...then leave the pump on so the system remains pressurized to keep the solution in the plumbing overnight. Then drain the tank through every faucet instead into the bilge, fill with fresh water and drain through every faucet again. to flush the bleach solution out the plumbing. If you still can taste/smell bleach, put about 5 gallons of water in the tank, along with a quart of white vinegar, run it through every faucet till you can smell vinegar and leave the system pressurized for a day or two. Flush that solution out refill the tank with fresh water.Btw, this also gets rid of any antifreeze taste/smell in addition to ensuring that your onboard water will smell and taste good all season.