Thanks everyone, lots of great information and I've already taken action on a few. Feel free to post any other info. I'm going to follow MSPEconomist advice and just get the 5 "Starriott" nights elsewhere, maybe extend my hotel in PVG for a night since it's only $77 USD and that way I can stay past late check-out. I'm not going to be paying any living expenses for most of the next 4 months so I can afford a mattress run at a Fairfield Inn near me.
As for the Visa, I have a Chinese Visa with 9 years left. My company participates in TechTAS and while our legal department didn't think I required it, I am getting in under our quota. They said since what I'm doing is < 90 days per visit and covered by this regulation, it really wasn't necessary, but I say better safe than sorry (bolded activities are what I do):
A person permitted to enter Hong Kong as a visitor may generally engage in the following business-related activities:
- concluding contracts or submitting tenders;
- examining or supervising the installation/packaging of goods or equipment;
- participating in exhibitions or trade fairs (except selling goods or supplying services direct to the general public, or constructing exhibition booths);
- settling compensation or other civil proceedings;
- participating in product orientation; and
- attending short-term seminars or other business meetings.