I currently have an 8 hour layover at BKK in Jan. I'm flying in from MNL and then heading out to ICN with TG on J. The layover is roughly between 3pm and 11pm. I'm already planning on going out, eating, and exploring the city. However, I will be carrying photography gear in my carry-on and I already know that BKK will not store baggage with electronics. This is my first time in Bangkok and not sure what are the "must sees." Here are my two options as of now:

-Keep the 8 hour layover and try to find a storage place in the somewhere in the city. I've seen Bangkok Storage http://www.bangkokselfstorage.com/ and they look legit.

-Change my itinerary to leave in the following morning. I can either get TG 600 (8am) or TG 628 (10:30am), to ICN via HKG. In this scenario, I'm not sure if I have to claim my baggage in BKK. Do they make you claim your baggage if the connecting flights are more than 12hrs apart?

Any suggestions would be appreciated.