My vote is for a new stem as well.
As for the grips- Ergon GP-1. Come in different sizes and trigger or grip shift variants. I'm a bit biased, though, as I have a set that replaced the stock rubber grips that started falling apart after I cut them down in order to install bar ends.