I agree with your ideas for her future.

They were my completely platonic OTP. He thought she was just brilliant and she wasn't afraid to roll her eyes at him, and I loved it.

I don't think she needs the Doctor, but I do think she needs what she learned through her journeys with him. The idea of her going back to a mundane life and being obsessed with celebrity gossip again hurts my heart.