I'd go for the longer layover and take an hotel night downtown.

Obviously more expensive. Provides somewhere to store your gear though, see more on your first trip, and you can do some photo stuff on arrival for a few hours, secure gear in room and also spend time out later at night.