If you hit 'Upgrade&Erase' button before connecting the board, that should work the same as Rescue button, using the packed firmware that matches the GCS version you use.
Post a screenshot from the firmware tab after a rescue.
You ask for a correct firmware version but do not mention what GCS version you use ?