Don’t worry about the calcium. People on the internet love to overthink things and spend other peoples’ money. As long as you don’t have any leaks, you won’t have a bit of problem. The only ones that have problems with calcium are those that ignore leaks for years.There's no reason to look for another set of rims either. If for some reason you have to drain the tires in the future and re-fill, go ahead and fill with windshield washer fluid or beet juice. But don’t waste your time and money fixing something that isn’t broke.
From what I can see right now there are no leaks and I see no rust popping out anywhere. But all I was thinking that when the time comes I will just buy new rims and then switch them over. That may not be for years down the road or it might be 6 months from now. I will cross that bridge when I get to it.
Thanks.