That is a risk you have to measure and decide whether to take it or not.
But I suppose you will run into same dilemma when boarding flight to China. They will take away your old I94 if you check in with a Chinese passport. They will question your visa if you check in with a Canadian passport.