My suggestion is a longer grace period, I think it should happen because the grace period being 5 minutes is to short and can be really unfair for people because there would be people in the surface getting stuff and they would be snuck upon on. If you decide to do this, the grace period should be around 10-20 minutes because people should be done with gathering tools on the surface
Even though I only played a few games of UHC , I think the grace period should be 10 minutes, so its no too long and also not too short.