Thanks, good points, I'll prob stick with the day trip.
An alternative would be to go there first. Flight arrives around 6pm, I'll probably be tired from the flight and goto bed early so that first night is probably a waste anyways. But then it adds complications with my luggage and such.
Thanks for the tip on immigration. I was thinking of getting echannel at the airport on my way in, wasn't sure if it would help coming back from macau.