Well I've found some of the leak. It was around the inlet to the pump basket. The shaving cream method helped a lot as the leak was on the bottom.
I still have some air coming in, but not sure where, maybe under ground, but I don't think it is bad enough to dig for it. The pump basket is filled...