Marina vs Hotel Zone

I am sure you will be fine. Marina is very close to downtown... 4 pesos and a fairly short bus ride. We are out at Nuevo this year, so we are quite far away from the action.

We have stayed at the melia for 9 years now, just came back from there, we went to town every night. not to worry town is so close you can smell it. and the marina is a great place to go right across the street.