On the way? No, you don't gift them by moving them to the city state, there's an option in the city state diplomacy menu, right below gifting gold. Instant (well, you get rid of the unit right away, 3 turns before the city state gets it), works anywhere.
Overflow SHOULD be handled ok, if...