So, I settled on the flat bars (or rather, the slight riser bars) with the Ergon grips. They really are the most comfortable for me. No more pains. Just the normal tingly, going-to-sleep-feeling in my right hand from years of mouse-work in the IT mines.
Of course, I've come this whole journey just to end-up with a bespoke Kona Dew. Sigh.