I ran into more or less the same problem but for different reasons. Not that I didn't want to send my bike back to trek stateside when I lived there but I was under time constraints due to a move overseas and I didn't want to ship my bike to Trek Germany after being without it for 2 months because of shipping it overseas.
This solved my problem and it offers pros and cons compared to the integrated dual solution.
Developed especially for e-bikes, the E-Mate bike bag allows you to securely stow a bike battery in addition to your daily gear.E-bikers know what it’s like to have a (replacement) battery lurching about in their bike bags.
www.ortlieb.com
Big enough for another 625 when you need to go dual.