Agree with everything you said, and I do think it will be Jamie that ends her. It has been foreshadowed a lot.

I felt the conversation with Olenna kind of made it more certain he would be the one.

This is a good possible foreshadowing, but may be stretching it.