Would I be eligible for the 72 hours visa: Macau (MFM) - Shanghai (SHA) - Hong Kong (HKG)

Hi,
I will be in Hong Kong and have to go to Shanghai on short notice. I know that Hong Kong - Shanghai - Hong Kong is not allowed. So my plan is to go to Macau by ferry, fly to Shanghai, and then back to Hong Kong. Also, the flight from Macau is to Hongqiao in Shanghai and not Pudong. Does Hongqiao offer 72 hour free transit or do I have to fly via Pudong?

Thank you for helping!