I think you are right,
Earlier I was watching FNC and they were talking about the pork in the first bill and the Club For Growth against this and a number of House Republicans like Ryan voting against this recent bill, and I came to that false conclusion that it was all in the same final bill.
It looks like this is a scaled down version without the pork that the Senate will automatically pass without the normal procedure. So this is a win not a loss.