I just went for the original plan, pulled the two main wires out and put blocks on them, then put a blank fascia on the switch. This way I can easily fix it back when I leave.
Not sure about taking the landlord to court etc, he's a nice guy and pretty helpful, which means he's worth his...