worrying about water woes

Our water problems are still not over...but have been put on hold for now. There is no water in our basement now, and we've taken measures to limit the possibilities of it coming back in. Yesterday we dug up the garden, and snaked a pipe from the downspout into the garden. This will divert the water away from the house and down the hill (thank goodness we live on a hill!!). It looks a little better now, but it's not ideal. But, it is only temporary until the spring. Then we will dig up the drain tile at the front of the house, and redo it.
The catch-basin at the side of the house is draining, but slowly. But, we are fighting with the city over who's responsibility it is to fix the plug. We think it's plugged on the city side, but we can't prove it. So, they say it's our responsibility. Instead of trying to fix it, we've decided to put a sump pump in and pump the water down the hill. It will all end up in the same place at the end of the day. And, on days like today, when we have a rain-fall warning, it will help to keep the catch-basin from overflowing, and possibly putting back-pressure on the rest of the lines around the house.
I know I should just relax...there's no water coming into the house now, and all should be ok...but I can't help but worry about things. Mind you...if I wasn't worrying about the water flow around the house, I would be worrying about something else.