At the moment, Ethereum clearly wins.
Future? Who knows.
But I believe that Waves is a solid project, and is expected to boom in 2018. Q1 2018 is the start for Waves smart contracts, Q2 Atomic swap.
Clearly good things ahead of both Waves and Ethereum.