I would reconsider the definitions you have for Yuri and Yaoi. Things go like this:
Shojo-ai: Girl/Girl Love (generally implied)
Shonen-ai: Boy/Boy Love (generally implied)
Yuri: Mature Content Girl/Girl Love
Yaoi: Mature Content Boy/Boy Love
That's better
