I have both and essentially moved all spend to a 2% back card as I have too many Starwoods points and little time to travel in the near future.
I'd only use Marriott for double categories like dining out and Marriott stays.
I continue to believe that the SPG card is the best value for CC spend if you can use them up in 2016, after that, who knows.
My 2 cents...