I'd just go with adding all income (investment or otherwise) into a total pool and then tax that with a single set of rules instead of this stupidly complex tax system.