It depends on how much you believe in Tesla's ability to deliver on promises and how long you plan on keeping the car. A lot of people with December 2016 AP2.0 leases that paid for it are rightfully pissed they'll see no value for 2 years or more.
If you're keeping the car for many years though, probably worth it just for the bits of self driving feature Tesla will segment into FSD. I'd be willing to bet that whatever is coming "this August" will be fiercely debated here as to whether it should actually be an EAP feature or is really FSD.
For my wife and me, it wasn't worth getting with the car (early June delivery.) We decided truly hands off, pay-no-attention-to-the-road Interstate driving would be worth $5-6k, with the expectation that we'd have time to recover from buying our most expensive car ever before it became available. So despite the price increase, we're still OK. Might have saved $2k if we'd just bought in when we got the car, but A) Elon hadn't made the August announcement and B) I'll believe it when I see it.