Corporations are owned by people, start by taxing them simply. Income should be taxed the same whether it comes from a dividend, capital gain or as wages.
You could mark to market, but it's tricky for investments that aren't liquid. Do you want to pay capital gains tax on your house every year because the market price is supposedly higher? Do you get it back if the market goes down again?