Just a quick update to close out the thread.

I ended up using a very low-tech approach to measuring both the stem and the handebar diameter. I used a drawing program (Visio) to draw out circles of various circumferences, and printed out the page. I very carefully cut out the circles, and used the remaining template to determine the sizes for the stem and handlebar.

I just received the new stem, and will be installing it shortly.