I don't really understand the distinction you're trying to draw between "make those who choose to live risky lives pay more" vs. "people who take risks shouldn't be subsidized by people who don't".

Aren't those the same thing?