For those who may still need them, Disneyland DelivEARs (1-800-362-4533)had both the Haunted Mansion and Astro Orbitor in when I called this morning. I'm glad to have these now, especially the Haunted Mansion.
I believe these have been unavailable for awhile. So, if you still need these pieces for your collection, give them a call. Good luck, and best wishes to all for a great day.