Hi, Stephanie! It sounds like you've got the birthday thing covered! Those are the top two recommendations on my list.
If you want to do something over the top special, you could consider the Pirates and Pals Fireworks voyage. This is such great fun! It begins at the Contemporary Resort, with an assortment of snacks and drinks while you mingle with some of your pirate pals. You are then escorted to waiting boats, which will cruise out to the most spectacular view of the fireworks from the Magic Kingdom. On your arrival back, you just might get a few personal minutes with your favorite Lost Boy himself! Depending on timing, you might also get an up close view of the Electrical Water Pageant.
You can celebrate in your room, with a specially selected gift from the Disney Florist. You can do something small or go all out with a full celebration. Check out your options by visiting
The Disney Florist.
Have an absolutely wonderful trip, and a magical birthday celebration!