In the end I took an image of the partition (as a backup) and then did the in-place upgrade to Windows 11. Everything went smoothly and all the odd quirks from Windows 10 appear to have disappeared.