@frangio Thanks for your answer! Even though my solution might be correct from a Solidity point of view, I ran into this limitation on Truffle's side: Storage layout upgrade with `hardhat-upgrades`.
I was able to modify the file in .openzeppelin as you advised and re-run the proxy upgrade migration successfully, but this means I can't run all my tests at once…