Erase the 25Q16 completely. Program it with a (size exactly 2MB for 25Q16). Verify the write.
To get the 22.3.1 version working again, you must perform a clean installation: vcds 22.3.1 hex v2 clone repair