That’s my situation
The AP to FSD upgrade is still showing at $6k - a few people in the S forums are having troubles since the vehicles actually have EAP, but their agreements show AP, so, their FSD upgrade price shows $6k.