One thought I recently had for potentially helping to balance the stacking of damage passives - what if all class passives were removed from the skill lines and added into a new skill line that was just passives? This would be a skill line that could not be substituted out, but would instead be the defining feature of the class. You would still be able to substitute active skills, but you would be tied to the passives that the class is known for. Obviously, some would need to be reworked not to be tied directly to their previous skill line (for example, increases based on X number of X Skill Line Skills slotted).