After going about the long way to replace the connector 30658215 which is a delicate job it turned out my connector wasn't broken. The root cause why I couldn't re-attach the connector is because at the base of the connector the silicon stopper expanded over time and it was preventing the connector to re-latch to the MAP sensor (even with considerable force applied). See pic 2.
If you run into similar situation like I did, a simpler solution (assuming you didn't break the connector tab) is to trim a little bit of silicon stopper inside the connector where the MAP sensor connector come in contact (Pic 3) with a sniper from the side. If it still doesn't work, you can remove the entire silicon stopper and trim further. I have included some pictures so you can see what I mean. Word of caution, this job is best if you have small hands and arms






