Regarding an upright stem, look at the Ergotec High Charisma. 90mm and 110mm versions with a 45 degree angle.

Ergotec have a range of high rise stems and if you don't have a local dealer, check eBay. German sellers offer them at the same price you would pay at a local shop or less.

Edit: leave the stem to last, after you buy your handlebars so you know your clamp size. Most modern bars are 31.8mm.