I would try the EHAS form now, but, I don't have my passport here at work. I think it looks different so maybe it's updated and we can submit vaccine ahead of time earlier than 3 days?