First question - I'm hoping that an expansion is released by then. Otherwise, no other workaround but to either skip or start a new pilot.

Second question - I say keep the previous rank, but I'll let CatKnight say for sure.