Quick update - 20G tank is doing really well now. But I had an eye-opening experience a couple of weeks ago buying stock for both that tank and the little nano. I was in an LFS where I had shopped before, and where I'd previously had good experiences. There was a different guy working there this time, and he sold me some cherry shrimp. In the same tank as the shrimp, they had some clown killies and scarlet badis. I didn't know much about either fish, but I specifically asked about their food and water parameters. The guy told me they fill all their tanks with tap water and don't adjust the pH (7.8), and that the killies and badis had been eating regular flake and frozen food with no problems. It was kind of an impulse purchase, but based on the guy's advice I figured they'd be ok in my tanks, which use the same tap water, as the place is only a few miles from my house.
So I got the fish and shrimp home, floated the bag for half an hour, mixed in some of my own water for about 15 minutes, and scooped the shrimp into one tank, the fish into the other. 4 of the 6 shrimp died within a day, and one of the killies died a few days later. The badis refused to eat, and after some research I discovered that most of them will only take live food.
So I went back to the LFS to figure out what happened. The guy who sold them to me wasn't there, but when I told the story to the guys who were working there, they gave each other a knowing look. "Was it an older, heavy-set guy?" one of them said, "Oh, that guy is the owner. He doesn't know ANYTHING. NEVER listen to him."
Turns out, that one particular tank was an aquascaping project one of the guys had started. It was filled with RO water, not tap. It was being pumped full of CO2. It was being maintained at a pH of 6.6. And the whole tank was being fed live worms, not flakes. Every single thing the owner had told me turned out to be untrue, and I ended up killing a fish and some shrimp as a result. (Hopefully the remaining killie and badis will be ok now - we'll see.)
Moral of the story - even at a good LFS, you can't count on everyone working there to be equally knowledgeable. And from now on, I'll test the water in the bag before I add the fish to my tank. You just can't trust what the store tells you about their water parameters.