So thanks for the charts & links and for your input. Very helpful.

I did measure everything and determined that a) the stem is an 80mm not 100mm, b) that it's installed already with the higher rise. Then I went to the women-owned bike shop that is SO much better than my other LBS, and they worked with me on the fit, which is fine except for the stem. They didn't have the shorter & taller one in stock, but ordered it for me. YAY!