I’ll be in WDW the same week as you! One special thing to mention–I don’t know if you’re Star Wars fans at all, but May 4th is “Star Wars Day”, as in “May the Fourth be with you”. The day after, in addition to being Cinco de Mayo, is sometimes referred to as “Revenge of the Fifth”. (Sith)
Disney hasn’t announced anything special for May 4th in WDW this year, and typically doesn’t do much. There will likely be some special new Star Wars merch dropped on that day, which if you stick with your current plan, will still be there May 5th. Here’s a thread I made about that week:
I’m on the May 3rd Galactic Starcruiser, which will be in DHS and Galaxy’s Edge on May 4th. With that, us Star Wars nerds have put together a pre-party at Planet Hollywood May 3rd, and post-party on May 5th. Return of the Jedi is also being re-released in theaters that week for the 40th anniversary.