I would be happy to see a long-term plan to phase out trade with China. Of course that couldn't change from one day to the next, but I wouldn't mind a plan to phase out trade with countries like China.
I'm not sure what you mean by political rhetoric. Are you saying calling it a subsidy would be misleading (?) because it was given on a condition? That seems a bid odd because subsidies often comes with conditions attached.