There is a new software update being broadcast now in the N West region. (Possibly all regions.)

Hopefully it will unscramble and reorder the channels correctly after your last Freeview re-tune!

Graham

EDIT: Just to confirm that my update has in fact corrected the channel ordering issues (takes about 15 minutes for the software download plus 3 minutes for the auto retune that follows.)