And on a sidenote:

Whirlpool transactions are valid Bitcoin transactions with fully paid for fees. It doesn't make any situation 'horribly worse'. 

Toxic change is spendable, but it comes with privacy implications. 
Swaps or their future multi party Tx0 transactions will fix that as well.