More options

1) If you have flexible schedule, maybe you want to consider getting your Canadian visitor visa by walk-in. For example, like Detroit or Buffalo, you walk in early in the morning and will get it back around noon. So, you don't have to let your passport hangling out there for two weeks.
2) If you wanna travel to China later, getting a H1B visa stamp is a good idea. You can book an appoitment online at "w w w . n v a r s . c o m" . The most economic way of booking an appointment.