Encrypted email for this user group is certainly not over, and there is still no realistic alternative for it. So PGP is not going to go away completely.
I hope PGP remains around for people who do need it. There are people who have a real need for secure communication, and they are probably able to invent a cover story to explain your meta-data leaks. (everyone knows I buy widgets and from him: it is no surprise that we don't want details about our negotiations public)