Yeah, I think you gotta read "hill giant" more as "baseline giant," i.e., big and smashy, no particular elemental schtick.
I share the concern that at least some of these options feel very melee-oriented . . . but I like the idea that in an emergency, you can cast heroism and shillelagh and...