Just thought I'd bump my old thread to say I finally got it done. Macker- I think I ended up going to the place you were thinking of. It was Chinook Glass.
http://www.chinookglass.com/
Super nice people, and when what they had didn't look like it was going to work, the lady I was dealing with wasn't afraid to seek some help to get me the right one.
Funny story, when I showed my girlfriend what I did today she was happy, and asked how much did I spend. When I told her it was $40 ($20 for the lock and handle and $20 to have a locksmith re-key it for me), she said "well, why didn't you get that done a long time ago then!"
I may have to show her this thread to say I tried.