Not nearly enough information to build a water with.
However, it's quite apparent that your water has Chlorine or Chloramine (as you've found out!)
So I do suggest using the bottled water, as you say you've had good luck with it previously.
Also, you know that you can remove Chlorine and Chloramine from your tap water by crushing 1/4 Campden tablet and mixing into your brewing water? Just crush it up and mix with a small amount of water until dissolved and then mix well into your brewing water. It will instantly modify the chloramines so they are not a problem.
If you want to understand more about brewing water chemistry, read good info from mabrungard and ajdelange and listen to the various podcasts that are out there, and especially Kai Troester.
You'll also pretty much have to get a water analysis report from a place like Ward Lab (less than $20) and having a pH meter is a very big help as well. But you can probably improve your water without one if you have a good report.
However, it's quite apparent that your water has Chlorine or Chloramine (as you've found out!)
So I do suggest using the bottled water, as you say you've had good luck with it previously.
Also, you know that you can remove Chlorine and Chloramine from your tap water by crushing 1/4 Campden tablet and mixing into your brewing water? Just crush it up and mix with a small amount of water until dissolved and then mix well into your brewing water. It will instantly modify the chloramines so they are not a problem.
If you want to understand more about brewing water chemistry, read good info from mabrungard and ajdelange and listen to the various podcasts that are out there, and especially Kai Troester.
You'll also pretty much have to get a water analysis report from a place like Ward Lab (less than $20) and having a pH meter is a very big help as well. But you can probably improve your water without one if you have a good report.