Or, the NSA needed to upgrade their access at both.

Do Microsoft still say "If the government has a broader voluntary national security program to gather customer data, we don't participate in it" today (which PRISM proved very false), or are they at least acknowledging they're participating in whatever NSA has deployed today?

PRISM wasn't voluntary. Also there are 3 levels here:

1. Mandatory

2. "Voluntary"

3. Voluntary

And I suspect that very little of what the NSA does falls into category 3. As Sen Chuck Schumer put it "you take on the intelligence community, they have six ways from Sunday at getting back at you"

“Voluntold”