I would start with trying a different stem with more rise. Before that "flip" your current stem if it's not that way already. Leave the bars and shifters alone and see if just a higher position is all that's needed. Good luck!