I had the same strategy as you.
it brought up to challenger 3.
at the moment I am still trying to figure what to do in the new system.
the rental costs are horrible at the moment, so that doesnt help as well.
to be honest, i dont understand this change and i think its really bad :(