Yep, time for a new tax man mate. Basically, all income/s are pooled into a total taxable income and taxed accordingly after claimable deductions, writedowns etc.
It can become difficult to claim CGT discount anyway if you're primarily a trader. Seems the gov don't think it's really possible to be a trader and an investor, so you're basically one or the other in their eyes - unless you have trust funds etc.
I don't even claim CGT discount for any of my LT holds(which is not that much TBH), as I'm primarily a trader and my accountant says it's not worth the extra potential scrutiny from the ATO by trying. The less attention from them, the better.
Good accountants are hard to find, when you find one, stay with him/her - even if it means travelling to see them interstate imo. Pays off the end.