Yeah…the heatsink, fan + chassis combo can only handle 28-30W sustained. So it’s looking like a U series. HS is 35W upward…and I can’t see that chassis taking on an additional 25% (from 28 to 35) in one generation.
Plus the battery capacity…that means 35W is even less likely.
Then plus the 65W USB-PD brick…(instead of, say, 90W)…that’s like less-less likely to take on the HS proc.