Don't know how good of an addition this would be, but:
How about the option to lay and wait for a specific enemy, and possibly ambush them? This could help in singling out very grindy enemies, and could open up some randy yet unconsentual scenes for specific enemies, or simply random...