I'm glad it was all sorted so relatively easily for you despite the long wait, at least you can travel with a clear conscience rather than have the worry all the way over if you will be refused entry. Have a great holiday.