I don't think Canon will make the 7D II a APS-H. I think it actually makes a lot of sense for them too. They can make the 7DII APS-H and then put the 70D much higher in the range to take the place of the 7D for people that want to stick with their EF-S Lenses.
I'm only really in the market for a FF camera in the future so I'm not so concerned with what the 7DII will be. I'm happy with my 7D now. But I will be much less likely to upgrade it if it's just a high MP APS-C camera. Canon needs to either redesign the 18mp sensor or put a APS-H in it for me to be interested.
I know I'm not the normal customer perhaps. I have no EF-S lenses to worry about and I'm content with my 7D. The 7D's AF is fantastic, the build quality is great and the feature list is outstanding. The only thing the 7D really needs is a new sensor. I would be fine with the amount of noise at high ISOs if the pattern was prettier.
As has been said though going ASPH would be users with EF-S lenses would be less likely to upgrade and would also mean that the new system lacked UWA coverage, not a problem for the 1D but the 7D has been marketed as a more all round system.
If Canon really wanted to target the 1D userbase then I'd guess staying at 18 megapixels, upping the AF and FPS would be the most obvious way to go with the extra range of the 1.6 crop being the big selling point.