I recomend you to check how modern tetris rng works. You could add some sort of weather patterns instead of randomly chosing one at the time. Also storm and rain should increase or at least maintain water levels in my opinion. And also maybe decrease water source count on heat waves?