1) Yes, that would be a good solution
2) Unlocking object interaction might work, but it could also become frustrating for players when they reach an object but can't use it yet. I'm not sure how to tackle this best.
