Can you add a pvc piece to the intake? I would attach a piece with a 90or 45 elbow on it facing downward. This should get rid of the whirling and air sucking that your pump is doing.