Well we came up with a solution, but it's not going to be implemented until after our major site rework next year:
1. Merge Shoujo Ai into Yuri and merge Shounen Ai into Yaoi
2. Rename Yuri and Yaoi to Girl's Love and Boy's Love respectively
3. Overhaul the current system that depicts the level of sexual content, ranging from "safe" to fully pornographic (replacing the current hentai tag)