You sound like you are on the right track. I would go handlebars/risers first but those three things will fix it.

Welcome to the site by the way. Don't forget to post some pics in members rides when you get a chance.