Well you can try reaming the by pass hole to free it up... also get a new intermediate shaft(which you already know)... how long was that shaft in there... I cant see the wear on the pump and housing very well but how deep is it in the housing... I would believe your issue is the by pass not seating