What to do about garage flooding?

I live in Eastpointe, Michigan and have an unattached, 2 1/2 car garage made of cinder block with a concrete floor outside of my brick home. I have lived here for 14 years and just last winter my garage started getting water coming in from the floor on one side. Every time there was a thaw the water would come up all along the bottom side. At one point the water covered half the garage and was approx. 2 inches deep at the one side. Outside of the garage, on the side where the water comes up, is only 3 ft. from the property line and fence. I put small rocks along this area next to the garage 14 years ago. They are now under water as well. My next door neighbor has been randomly adding soil to his backyard, due to dog digging and he had a pool that had left sunken areas. I suspect his adding of soil has changed the pitch of his yard and now all the water is running right towards my garage. I can build up the area next to the garage (the 3 ft. area) by adding soil over the rocks, but the concrete driveway runs right along the property line and it is under water about 10 ft. past the garage all along the fence line and in about 3 ft. into my property. I know I must do something about this very soon, as it is only February and the garage has had water twice now for the 2nd year. I am concerned that the foundation will crack or be destroyed when the water freezes up again. Please tell me what I can possibly do? Thanks so much for any advice you can give.