I happened to compare the two understandings of the 7th pauri - first by Amarpal ji, and other by Master Teja Singh (posted on this site by Neutral Singh at http://www.sikhphilosophy.net/sikhph...hread.php?t=13)
Reference:: Sikh Philosophy Network http://www.sikhphilosophy.net/jap-ji-sahib/449-japji-sahib-pauri-7-a.html
and this comparison led to a few conflicting understandings too. However, your explanation sounds more appropriate.

Amarpal ji, your way of explanation is the simplest, to the point and without any heavy words. And that s good for learners like us.
In appreciation to the good work by you,
with Best Regards.