It seems as if you've pretty much answered your own question in the original post!
I'll give my two cents though... I've used adjustable stems, and stem risers, and though they did raise up the bars for a more upright position, but they aren't pretty, and they can negatively affect the handling. A longer stem is really just going to move the bars away from you. You should probably start by figuring out how much you'd like to raise up the bars, and whether or not you'd like them to come back toward you as well. Then you can make the right decision about what to buy.
"Albatross" or similar handlebars are very appropriate for a more upright position and the curves in the front provide a more aggressive position should you find that necessary.
Good luck!