If you are not convinced, try the GDP growth simulator on The Economist : Save the Date.

I tried a few possibilities, but in every situation I get China overtaking the USA in GDP between 2018 and 2020. In the 2018 scenario, I table on a stronger appreciation of the yuan to accelerate things.