Boiling doesnt remove chloramine which is also used by some water co's. This has the same effect as chlorine.
Good 'point of use' water filters will remove chlorine and chloramine. (GAC filters:granular activated carbon filters).
Alternatively you could prepare your brewing liquer by adding 1/2 a crushed campden tablet per 5 gals before you start brewing. This neutralises the chlorine and chloramine, the effect is almost instantaneous.
As for your current batch, if you have the space to store it and can spare the bottles or keg then you could wait and see if it improves but I wouldnt hold your breath. (I'd dump it).
edit: campden tablets (sodium/potasium metabisulphite, although widely used as a preservative in beer and foods, can trigger attacks in asthmatics)