Seems like a fuel issue more than fuel-air, I stalled on a hill recently coming home with less than a 1/4 tank, had the same surging above 2k until I was parked on level ground and it went away, the fuel pump doesn't seem to be able to get all the gas out of the bottom.