I would surely try a flat or riser bar on your M stem before going to the trouble to swap out. You can also buy an Alber Halo which will put your bar out another 2 inches or so. Dropping the height of the bar will also create a longer reach for you. You may or may not need a QR post binder instead of a bolt to move the bars for folding purposes.