I would imagine there is a good market for fluid dynamics, with everyone trying to learn java and be web programmers these days. I do think that having a good CS background will help you in developing models or control systems, so it's probably worthwhile to have the experience you do.
I started out as a EE, then a programmer, then a unix admin, and now I'm stuck in management.