This is probably the only thing that sucks the joy out of the hobby because of the time and mess. I usually start during the day and finish up at night just waiting for water.
I had exactly the same issue
Part of my solution is a tight fitting lid and aerating with an air stone/venturi - that means I do not need an ATO, salinity goes up from 1.025 to 1.026 in a week or two due to evap. An extra benefit is that it's very easy to pull an airline to the outside, so no low ph happens due to indoor CO2.
The first thing I did with the current restart is that I threw my rodi unit into the bin. It was a massive relief. No, I am not gonna wait for water ever again, thats just not a viable route. Wife not gonna laugh at me anymore when I stay up till 2am to tinker with my rodi lines and waiting as water is "almost done"
What I do now is that when I need water, I drive with the 5g jerry can to the closest spotless water station, fill it up in 10 seconds, at home I add a BIG heater, a small pump through the mouth of the can, the exact amount of salt and water is done very fast. I add a bit of a prime to be on the safe side, and that's it.
I am in the uk, there are like 3 stations within 10 minutes drive, I am not sure where are you located and whether you have similar things in your country, but if you only need 5g like me, this is the best solution.
And now instead of my wife laughing at me, she now cant figure out where the hell I am getting my 5g water in minutes - I will never tell her my secret hahahaha