is it possible to swop the 20gb out of my MK1 (and vice versa) and then upgrade the player software

Yes, you can do this. You will need to upgrade the player software, as you say.
_________________________
-- roger