Have you looked at this one?
http://ginza-kagayaki.com/fr/Tops
Expensive but lots of variety and it has gotten a few good reviews here. If you are looking for guaranteed FS then maybe yoshiwara ascot club.
http://www.ascot-c.com/
I have experience with neither so can't comment on them personally. I use OL and JK style frequently and I am confused by your specific complaints. The above recommendations assumes you just you want to pay more for hotter girls?