Defunct Iron golems

Iron golems seem to always wander around and get stuck somewhere stupid. They should:
A) just teleport back to the village meeting point if they can't pathfind to the meeting point. Maybe give bells an additional use for this purpose or
B) go defunct as in revert to iron and pumpkin block state and spawn a new golem.
Also, villagers have then same problem and it would be nice if they did similar or else would enter a lost state and ask the player for help. From there they mimic the player's movement and gift the player with a few emeralds and an item.