ditto on the shower! take as much time as u can. make it fun. spray her, then push it away. let her catch the water with her tounge. position the shower head so it hits her body below her head. lots of times the water on the head thing freaks them out.
with a bath, introduce a new cool toy, just made for bathtub. they have neat crayons for the tub, fizzles that turn the bath water colors, or cool bubbles. one thing my daughter loves is that cheap shower attachment that u get at any store. it hooks onto the faucet like a big rubber hose. then we 'shower' with it while we sit in a tub of water. it is easy to wash the soap out of her hair with a controlled hand held shower head.
wish u the best!
J.