It sounds like you are on the right track cleaning the MAP sensor and waiting for the dealership to sort out the fuel pump. If the codes persist, and the dealership does not resolve it, consider upgrading to an aftermarket lift pump like the AirDog or FASS to provide more consistent fuel...