Picked up a new Map sensor and it seems to be all cleared up. Took it to the lake to break it in. Quickly realized I hadn't put the plugs in the exhaust manifold riser plugs in. So ran it a few minutes, then headed back home and put them in. Tomorrow should be the day!