You mentioned vacuuming out the sediment with a shop vac. Will any shop vac work? Is there anything you did first? I guess I want to know if I can just vacuum the crap out it
Why do you want to upgrade your pump?

Why do you want to upgrade your pump?