The LM2596 will handle up to 40v in so do a simple switchover between battery and power pack to the input of the converter.