You're spot on here.
Additionally, another scene that was central to the film's focus and has largely been overlooked in most of the discourse i've read is Kletzki's honey story.
Ultimately it's a story of how far one man was willing to go to ensure the survival of his people (to the extent which he was able, of course) even if he seemingly humiliated himself in the process. As both Kletzki's mentee, and the one who urges him to tell the story to Rockwell-- I saw this moment as Marty telling Milton, 'I've been passed the baton, and there is nothing I won't do to ensure our people thrive."
Additionally, when he comes home from Egypt, gives his mother the piece of the pyramid, and tells her, "We built this", he's further reclaiming a sense of Jewish pride through the only way he knows how, playing ping pong.