Hmm? In R/S, they just kept the original 5 HMs from RGBY, and added three new ones on top of that as HM 5-8. Then, in FR-LG, you picked up those same first 5 HMs like normal, but once you beat the game, you could go to the Sevii Islands, and get and use the last three there. In other words, FR/LG and R/S/E used the exact same HMs as each other (and TMs as well). Since they didn't change the HMs/TMs for FR/LG, I don't really think that they will for HG/SS either, and that they'll figure out some other way of handling Whirlpool (and other HM issues) instead.
R/S/E had Dive as HM08, whereas FR/LG only had 7 HMs (up to Waterfall) and didn't use Dive at all. I don't think it's too farfetched for HG/SS to replace Defog with Whirlpool or something like that. To be honest, speculation at this point is pretty pointless, because during the time of the original GSC, Rock Smash wasn't a HM and Dive, Rock Climb and Defog didn't exist. Really anything could be done with the HM list for these new games.