If its one class I definitely miss from my first playthough its the Druid, so far it seems like the strongest class in the game to me. However, Druid doesnt seem to mesh well with 2 rogues. Switching out 1 Rogue is an option I've thought about, but I prefer to try 2 for now (1 dual wield, the other can be ranged/melee).
If I were to switch out a Rogue, I would probably go:
Paladin/2nd tank/Dmg mage/Druid/dw Rogue/Priest, im not liking the Ranger that much.