Weekend from Hong Kong

Hello,
I am a UK citizen living and working in HK. I currently hold a 2yr multiple entry visa for China, but this expires in Feb 2018. I wish to go to the Shanghai Grand prix in April 2018 and hope I can use the free transit. If I fly from Macau to Shanghai, stay for two nights in Shanghai, then fly Shanghai to Hong Kong, am I eligible for the free transit?
Thanks.