Hey Joby, have you considered Lime-Away for the water spots? I've used it for years on different things, including putting it in coffee makers (it's a recommended use).