May have 2 issues here FP :
1. You didn't mention the RCM resolder ( fits the above start symptoms )
2. The battery drain - hook up a milliamp meter between the disconnected negative battery cable and the negative post on the battery with every thing off : should see around 30 ma or so drain. If lots higher, start pulling fuses one at at time till the ma reading drops - that will be the area where the problem is.