The whole "social housing" thing needs a complete revamp.
Instead of giving people a house that they can stay in forever, all council houses should be done up to a decent rentable standard.
They should then be let out at market values.
Alongside this we revamp housing benefit such that people get enough subsidy to actually rent the size of house that they need at market value.
So there will be no difference in price between council-owned and privately-owned houses.
The housing benefit bill will go up, but the amount that the council (I'm using this as shorthand, I know it's not exactly "the council") brings in will also go up, so it will balance out.
If your earnings are very low, you will receive enough housing benefit to rent the size of house that you need.
As your earnings increase, the amount of housing benefit you receive will decrease, but you will still be able to rent the size of house that you need.
People earning £40,000 may or may not get a bit of housing benefit, depending on how expensive it is to rent a house in that area.
There will be no massive step-up between renting from the council (which currently often happens at well below the market rate) and renting from anywhere else.
If you leave a council-rented house you will not have to worry about "what happens if I lose my job" because you will know that if you lose your job you will get sufficient housing benefit to continue to rent a house of the size that you need.