To be perfectly honest, I don't think Makoto's feelings were mutual. Ryuji's evaluation was correct on why Makoto was dating him. That said, I don't think it's a bad reason. That's what dating is for. I think Ryuji made the right call.
I don't think Makoto feels any romantic attraction to Aoi either. This is just a part of Makoto's growth and experiencing new things.
That aside, I'm happy to see that Aoi recognises that she has friends who love her. It's sometimes hard to love yourself, and even harder to believe that anyone else loves you. I have a feeling that when she finally comes face to face with her mother, it's not gonna be pretty.