Sounds like you're on the right track to me. Maybe add in another day if you can and go somewhere different.

Veronica