Oops, I forgot the young Henry. So you are correct. Andrew is 5th and soon to be 6th.
If Charles were to die while Queen Elizabeth is still alive, would that not make Andrew the next in line?