As an update:
Arrived in HK on Tuesday at 11:50pm, caught the MTR Airport Express to Hong Kong, checked into the IBIS Hotel.
From there, in the morning, I walked about 800m to the CTS (China Travel Service) office and joined the very short queue.
Consisted of Passport, HK Visa Slip (VOA)...