The quickest fix would be to simply allow those who cannot get affordable coverage due to an existing condition (based on a percentage of the W-2) to enroll in Medicaid regardless of their total income.
Which is what should have been done back in 2010, rather than screwing around with the entire healthcare system.