Being the N95-2, you should not tick the box "Back up memorycard"
This is untouched by the firmware upgrade.
I have recently upgraded my N95-2 to V20, and did the same as you, backed up everything, BAR the memorycard on a Vista laptop, then upgraded using our XP laptop, then restored everything using my Vista laptop again, and all is good, and even Spiderman still works.!
Own an N95.? Join us over on www.N95users.com/forum