Any gin cocktail I try that calls for soda water or club soda, I always try with tonic water first because personally I’ve liked all of them more with tonic. I’ve tried a Tom Collins with tonic also and it’s amazing, I’ll have too add angostura bitters like your recipe and try it out, I’m sure it’s a welcomed addition!