BS's email on RTO going from 3 to 5 has been misinterpreted by your leaders. Re-read the wording, expectation is the key word. This is not the same as mandatory.
The hybrid role remains 3 days, the badge swipe remains 39 days. The expectation is you go in 2 additional days if you can. If you cannot, then don't.
Don't believe me, ask your HR rep if the above is correct or not. You'll be pleasantly surprised.