2007 Toyota RAV4 electrical system problems

Electrical fire starting inside master window control switch. I was cleaning my car with the ignition on battery power (in order to listen to the radio). After approximately 30 minutes I noticed a burnt plastic smell, considerable smoke pouring out of the driver's door and a small tongue of flame from the same place. The source of the fire was (later found to be) the white electrical connector, for the front passenger window master control, where the physical window switch meets the circuit board.

All dash lights turned on and steering wheel was hard to turn. Drove home. Restart the vehicle, no issues, left it running, it happened again and smelled a burning smell. Had it towed to toyota dealership. They replaced battery. Yesterday 11-18-14, same issue going about 40 MPH. Had it towed to same dealership. Alternator needs to be replaced. Toyota also informed that water pump is failing.