ok well my accord has an electrical short somewhere that drains my battery and a fuel pump issue right now, so do you guys think replacing the engine completely will rid me of the issue? or how could i make sure to take care of the short? there are no lights that stay on in the car, ill park it at night and wake up with a dead battery