We cannot wait for a vaccine that may never come - unfortunately a lot of people seem to think we have to. It's the public feeling that will be the biggest barrier to resumption of normality. Just have to look at the reaction here in the UK to the Sunday Times article about the British Government's handling of the early days. Many people calling for Boris Johnson to be charged with manslaughter. Completely disproportionate reaction and we're not going to see that go away any time soon.
I agree that instant/rapid testing would reduce need for social distancing and load reduction, but I feel that certain measures could be implemented or retained to help where possible, such as back to front boarding and earlier boarding to reduce crowding. The other end of that is grouped disembarkation upon arrival, to thin out queues and massive groups at passport control