Passenger door lock & ancillary carrier questions

Typical! My passenger door finally decided to unlock today... and it's been raining ever since. :(

I took the central locking fuse out this morning whilst I looked through the guides but with the rain showing no signs of stopping it doesn't look like I'll be tackling the door today. Stupid question I'm sure but is there any way of stopping the deadlock on that door for now or is it simply a case of putting the fuse back in, locking the car and waiting/hoping/praying it unlocks on a dry day?

I found this earlier but I guess disconnecting the electrical plug connections for that door only helps if I wanted it to stay locked independently of the rest of the car (which it does of it's own accord anyway.) http://workshop-manuals.com/skoda/fabia-mk1/body/body_work/front_door_central_locking/front_door/removing_and_installing_the_door_lock/

I found the guide for removing the ancillary carrier, looks a bit involved and fiddly but if I manage to get the thing off how do I reattach it? I can see people saying you can get the rivets from Skoda but I don't have a rivet gun, heavy duty or otherwise.

I'm going to have to take all 4 carriers off eventually as despite sealing the doors and the drain holes being clear my doors are now holding water and only release it once they are opened, swung back and forth or a long curtain wire is inserted and jiggled around inside each door but I still don't really want to fork out for a rivet gun that won't get used on anything else.

Also I've seen people saying a replacement lock mechanism is £40 but I found these 2 guides that seem to be saying the most common fault is the soldering on a couple of joints or one of the micro switches, I know they aren't specifically for the Fabia but is this not the fix rather than buying a new lock mechanism or am I missing something?

http://forums.vwvortex.com/showthread.php?1542461

http://www.taligentx.com/passat/maintenance/doorlockmechanism/