Has the Google-China row turned nasty more because of the rivalry between China and the US?
Nope. It turned nasty for the reasons stated. Google is a large, powerful company and didn’t like the Chinese government’s censorship of Google searches. The Chinese also were responsible for hacking into Google’s operation. In China companies are servants of the government. Google couldn’t adjust to that kind of oppressive system. Good for them!