I think there's definitely a hole in what Wikipedia says. I don't think Intel would only release CPUs at either 20W for dual core or 45W for quad core. That's a big gap, that it seems likely a few 30-35W CPUs will fill.
If not, I highly doubt Apple will go for 20W CPUs in the 15" and 17" MBP at least, as they are likely to be quite slow. More likely they are destined for the MBA. Especially as with just a small redesign, or slight underclock, Apple could fit a quad core in there that would blow the present i5/i7 away.
But 45W quad sounds fair due IGP. Duals will top out at 35W, no way they are all 20W. Hard to say, we will see
AMD had/has a tri-core processor. Maybe intel will make a mobile variant of their own in the future?
Tri-cores are just quads with one core disabled which is IMO cheating. AMD has done that a lot to keep their prices low