That's true. I just think of kilowatt-hours as a single unit, like Joule. That way it's no more bizarre than saying Newtons instead of kg m/s^2