Thanks for the suggestions guys.
Sorry I should have stated in the original post that I am looking for an off the shelf part as this is for a new revision of a product, I am looking for improvements that make the manufacturing easier and doesn't leave a loose lead when the 9v battery isn't used.