I would head over to the bike shop and see if you can get your bike fitted before you started swapping out components. I had the same problem with my road bike when I started training for my century this past summer. I little tweek here and there and I haven't had a problem with my hands since.