First off, the water softener is a GOOD THING. That helps with spots a ton.
You should be able to get most or all of the spots out with some clay. If not you may need to step up to compound and a buffer.
Try the clay first. Then you must polish after to protect the paint. It dosen't matter what you use as long as it's something.
Also out of the sun for this.
Good luck.