do not add water as it will not mix completely, if you want you can add lemon juice or lime juice now (it can actually be used to make tinctures it has a very high alcohol content) and it will help increase potency and improve the taste..
or you can add it later just to help with the taste