For a leaf problem try one of those skimming products...
I have the pool devil pro. It's cheep & I just hook it up with a universal adapter to one of my returns... if you have several returns, you could do more than one pool-devil
I think there are abunch of different types of these products on the market.
The pool devil has worked great for me & we have a lot of trees surrounding two sides of the pool.