HBM2 isn't on-die, and the HBM2 is reportedly smaller than a GDDR5 controller. So the die size would be still somewhat plausible, when cutting on the register files compared to GP100.
So you expect the GP104 already has cut register files as it is 7.2B transistors ?
Personally I would think they keep that the same across a generation.