Well, your overstocked. Angelfish need about 10-15 gallons a piece, and then if any pair up, those 2 would claim the entire 30gal. The other 2 would be at the mercy of the pair and would need a new home.
Also when you say you're buying water, what exactly are putting into the aquarium? If its...