EAP was $5,000 and FSD was $3,000 on both our 2017 S 100D (delivered in March 2017) and our 2018 X 100D (delivered last week).
For both, EAP was listed as an after-delivery upgrade for $6,000 - which is still the case.
For both, FSD was listed as an after-delivery upgrade for $4,000 - which is now $5,000 for new orders.
I'm not surprised the after-delivery upgrade cost has increased - it could reflect Tesla's determination there likely will be a hardware upgrade required to get FSD fully functioning.