Thought i'd update you guys. He didn't end up proposing that weekend, but he did propose! It was about two weekends after I made this post, and he proposed with his Marine corps ring because he was so nervous about buying me one and was afraid I wouldn't like it, but he didn't want to wait any longer. Apparently, he had been looking for a ring around the time I posted this, so I wasn't totally off. A few weeks after that, we went ring shopping and he bought me the most gorgeous ring ever, set with the diamond from my great aunt's ring.
We are having a courthouse wedding in July before he deploys, and then moving in together and having a bigger one when he gets back. I'm so freaking happy with him I could burst.