Riggs Spring is very reliable and tasted fine to me. Iron Spring has always had plenty of water when I've been there, but it's nasty looking:
Also... I know this might break the illusion of being in the wilderness, but there are a couple of spots that it would be fairly easy to set up a water cache via a side hike to/from the road. The park may frown upon that approach -- not sure of their rules.