Body odor problem. Please help?

I have a serious B.O. problem. I take medicine which causes my body to make more sweat. Consequently, my body odor can sometimes get the best of me. I can shower and still notice a funk about me. What would be a good deodorant for me to try out? Also, would shaving my arm pits help? I'm a guy but I don't think it would look that bad. Any suggestions would be appreciated.