Two other things I'd check are the voltage regulator and the ignition switch. Either one being faulty can drain the battery in a heartbeat.