She said yes!
Yesterday I went and bought a ring, got my hair cut, got my eyebrows trimmed (they were unruly, it was painful, let's move on), and shaved (rare for me).
Today I went to the build-a-bear workshop, recorded "(full name), will you marry me...again?" and then drove to pick her up...