Checking your math -- 35k base + 9k battery + 5k AP base = 49k.
I guess you also want 5k for luxury package, 1k for non-black paint, 1.5k for wheels and 3k for the non-yet-released L3 autopilot? Then you are in 59.5k price point - you got everything available right now.
I'm fine with black but didn't expect the base wheel option would be Aero. Full self-driving and premium puts you in almost the 65k range.