Kittykat, You must stop the water from reaching the foundation, that is imperative! Think of yourself, not as the little Dutchman with his finger in the dike.
If you construct a surface channel for the water that is running onto your property from the uphill lot, and have that channel flow to the lower of the two sides of your property, you may then divert that water into a channel above ground, or a pipe/conduit below ground, with small inspection points, much like mini-manholes that would be used to keep the water running down hill. At the bottom of the run you could construct a "pond" or cistern to collect that water, and if you wished, add the runoff water from your roof. Screens of some type are essential to keep major debris from clogging the system. As an example, just look at the screens along the road to filter rain water off the roadways. The size of the screen will mandate the frequency of the screen cleaning, and system cleaning. No screens, and you could have rubber ducky races in heavy rains! Remember, Keep Your Powder Dry!