One simple way to avoid 'involuntary celibacy' is for straight men to wear shoes that are not sexually repulsive on the first date. Women have strong & consistent preferences about shoes, and most American guys fail at this:http://observer.com/2015/09/7-pieces-of-shoe-advice-for-men-from-434-single-women/ …
Shoes are a fitness test. Once men figure it out it will cease to be a good signal, and thus will no longer be important.