I would be playing with both expansions, yes. Though, I have to admit, my enthusiasm for doing so is no longer as great with the confirmation of this scaling issue.

I'm reading through a couple of the balancing mods listed by zahratustra, but it's hard to discern what's appropriate and what's not, with not having played through previously.