Dear szh122;
For water it sounds not bad, except that you have not to deal with moles at all, because all specific heat parameters are given per gram!
Of course that the second follows the same concept, but now you have to deal with both, some with moles and some with grams!
So take care for the units given!
Good Luck!
ARGOS++