I see to deferant problems here:
1. Sov displacment when building a city.
2. Unit displacment when leaving garrison.
for the first one I would suggest to just automaticly garrison the sov in the city, for the second one I would suggest to spawn the unit the city tile (the one you get when you first build the city)
Warder