I assume they used "Riv-nuts", not pop-rivets. Riv-nuts are what a lot of frame builders use on Al, Ti or Carbon frames and they work well if installed properly. The thread size should be M5x.8
I agree that velcro straps or zip-ties are not going to position the bottles reliably.
One other possibility: a Camelback.