I know if you buy from the Disney Store, you will have to wait until you arrive at Walt Disney World to add the non-expiration option. I don't know if AAA offers the discount. Again, this would depend on your branch I believe.
Go to Mousesavers.com and join their e-mail list. The next newsletter comes out on 10/15. They will send you a link to Ticketmania with the best discounts available.