Improve memorial final location detection

Brings the improved overmap detection from #2469 into memorial location detection.