A couple ideas. Thor chimes in regularly here so he may have more.
On the same webpage you reference above, the Aber Hallo stem to give more rotation. Don't forget you can do backwards as well as up.
Perhaps combine that with the Nitto Trekking bars in 25.4 to give multiple hand positions and give your wrists a break? Top two on this site (black or silver):
http://sheldonbrown.com/harris/handlebars/index.html
I don't know what this will do to the fold, though. I think this is something where you'd try the Aber Hallo stem first, and if that wasn't enough, follow with the trekking bars.