If you added water at the end to make up volume then your numbers( OG) may be a bit off due to inadequate mixing. Your calculations however, are correct.
Also, the wateryness ( is that a word?) will go away when you carbonate. Carbonation can do wonders for mouthfeel