I recommend gem skipping the Tavern upgrade and use it on your Theatre instead ... that way you will unlock the Apocathery!!
I assume in time Adamir will move to our kingdom and become a kingdom-walker like the rest ...
There'll be plenty more storyline before that ... We'll need to build him a home etc...