I have not checked numbers, but the logic looks OK.
Yes, you can ignore pentane presence. That's an approximation only, but a reasonably good one (compare mass of pentane with mass of water - that's the order of magnitude of the error introduced by the approximation).
Pentane is C5H12, but I guess it is just a typo.