I highly doubt that will ever be the outcome.
Number of CS degree holding professionals (with a citizenship) might be decreasing in big technology exporters like US but on the other hand, developing nations are turning into "-insert anything here- engineer" factories.
This situation directly creates the consequence of immigrant work force or dramatic shift to outsourcing. History always showed decreasing remuneration for the highly outsourced or immigrant workforce led jobs.
The "reason #2" you cite is a one-way ticket to the island of expensive to maintain and impossible to scale code. Computer Science education is not meant to teach practical industrial skills. That's why it's called science. A CS graduate is expected to exercise scientific approaches in the software development life cycle. On the contrary to common belief, software development is becoming much more complex every year. Compared to early 80s, the number of functional and non-functional requirements even in trivial software projects are now dramatically higher. Ad-hoc and non-scientific development habits are just causing more expenses rather than resolving the problem. In tandem, the requirement of professionals educated in relevant scientific discipline increases.
Today, a modern CS education is far more complex and expensive than it was back in early 90s. Average student quality, required effort to achieve the degree and persistence is ever increasing. On the other hand, industry salary median is decreasing... That's the very reason of the obvious decline of CS graduates in developed nations. The native conformist culture of developed nations and the resulting mindset of younglings just can't justify the time, expense and effort to achieve a CS degree.
As a result, I believe the salary median of CS degree professionals will remain unchanged but the parameters of the result will never stop changing... Outsourcing and immigrant workers will be decreasing unit cost of required education/experience but the ever increasing education and experience requirement will keep the result in balance.
National politics to keep this area of workforce national (pun intended) is just another topic.