RE: Firewall problem
Just drill out the new holes according to the template. However, I would plug the old holes just to help keep oil and grease out of the tank compartment. Epoxy wooden dowels into the old holes and seal the exposed wood with epoxy and you're good to go.
Ken