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 pressure. Also, watch that pump control module near the spare tire, as it can act up unexpectedly. From personal experience with the
L5P delete instruction, make sure you address any small issues promptly letting them linger can lead to bigger problems. Best of luck.