Shenzhen-Macau trip, anyone help me with visa issue?

Hi! I have my 1 entry one to CN as will be in SHZ on the week of 23rd of Sep., but would make a 1 day drop off to Macau. I assume I should ask for a VOA before taking the ferry. I am from a EU country, checked, Macau in general is free for a visit for me, but I should get back to SHZ on the same day somehow... Could you please advise? What is the best and smoothest option in order to extend my visit to Macau, which will make me eligible to enter China 'again'? Can I get something at the Ferry Port on the day of the planned Macau-visit?