I've got a 7d, and frankly, i'd put up with less AF points if they were better spread out.
For anyone who doesn't know, they're in a diamond shaped around the centra, of course, but only take up maybe half the height and 2/3 to 3/4 of the width. there's a whole big border that has nothing.
I was taking some photos of birds diving at sea on the weekend. There's a good proportion that were out of focus (more to the point, focussed on the waves in the background) and the bird is still fuzzily in frame, but on the edge.
Give me less AF points, give me more, don't care, but put them closer to the borders.
Nikon has 51 AF points on the top 6 models i just clicked through on wikipedia (D3/s/x, D700, D300/s), and the D7000 has 39 points. I've never used one, so i can't comment on quality vs quantity, but if number is all we're talking about then they have little to no differentiation in their model numbers.
My 2c: The only way that the 7D2 is getting a new AF system is:
a) if the 1d5 and/or 1ds4 come out first, with >46-point system. Then the 45-point is 'old-tech' and can trickle down to the 'lesser' 7d2. (same way as the sensors trickled from 1ds3->5d2 and 7d->60d->600d->550d)
b) canon actually change their 'trickle-down' strategy they seem to have used all along, and more interestingly, they make something new 19<x<45-point for the 7d2 and give the 5d2 the 19-point from the 7d. (more fun, but less likely, trickle-down does have advantages for R&D costs and volume-savings...)