That all sounds fine to me. I wouldn't swap out or remove any parts unless they're broken and I wouldn't upgrade past Acera level. I'd only bother upgrading the fork if you are going real trail off-road and then you should get some nice tires at the same time.
__________________
Genesis 49:16-17
"Well, well!" said Holmes, impatiently. "A good cyclist does not need a high road. The moor is intersected with paths and the moon is at the full."