I highly suggest just using the battery on top with a strap, and maybe DIY'ing with some rivets a new water bottle holder. You can get a rivet gun and rivets on Amazon for not much, or your local LBS can probably but two in for you.

I have 2 DIY ebikes and had the same issue.