I am glad to see you intend to go back there. I'm sure you will be smart and not go broke like I did visiting Costa Rica so many times! But it did me so much good I don't have any regrets.
I discovered that my Visa is good until Jan 2018.. So my plan is to go back for 3 weeks or so, late this year, maybe November.. I have a few Friends there now, It would be enjoyable...