Air discharge, no.Does the discharge pipe in the air-over tank go all the way to the bottom of the tank?
A 2 HP pump is big. When you pull it, note the waterline on the pump. That can help you select a better size pump for the new one. A 7 to 1o gpm pump is right for most houses.
I have never tried to pull a pump. Getting a pro in for a day, and have water at the end of that day is good.