You could structure jizya and kharaj through an urban municipal tax.
Anyone who desires to live a hedonist goy life may choose to live in the Goy Quarter of the metropolitan area, and a municipal poll tax is levied on every adult resident therein. Similarly, a municipal corporation tax on revenue can be levied on otherwise-illicit businesses. This revenue is then remitted by the municipality to the state treasury.
This solves the messy issue of the state individually determining the religious status of individuals. Instead, you declare your status by where you choose to reside.
We are quite literally living through the End of Times. Those who can see, are seeing. Just look around today, so much of what we see is what we have already been told.
May Allah protect our iman. Tough times.