I found your translation much easier to follow than srigranth.org. As I liked this shabad alot, I wanted to get a real feel for it, so I had a go trying to do my word for word method.
It would be a a really nice one to do for kirtan I thought, so I felt it is important to really feel the message when trying to express it in this sense.
I haven't tried to correct any of yours or compete for clarity or anything else.
But, it's just my way, that makes it easier for a novice like me to understand and feel the essence. ਤਪਤਿ ਮਾਹਿ ਠਾਢਿ ਵਰਤਾਈ ॥ ਅਨਦੁ ਭਇਆ ਦੁਖ ਨਾਠੇ ਭਾਈ ॥ Ŧapaṯ māhi ṯẖādẖ varṯā▫ī. Anaḏ bẖa▫i▫ā ḏukẖ nāṯẖe bẖā▫ī. Reference:: Sikh Philosophy Network http://www.sikhphilosophy.net/showthread.php?t=38451 Heated one made cooled off. Brothers, happiness prevails suffering takes flight. This 1st line is itself so strong. It could be that 'within the heat (mahi implies inside)of a person the coolness of soul prevails. The soul is always said to be cool compared to the blood rushed body. Oh brother, calmness or serenity somes and pain runs away(naathe). ਜਨਮ ਮਰਨ ਕੇ ਮਿਟੇ ਅੰਦੇਸੇ ॥ ਸਾਧੂ ਕੇ ਪੂਰਨ ਉਪਦੇਸੇ ॥ Janam maran ke mite anḏese. Sāḏẖū ke pūran upḏese. Fears of birth and death erased. Complete teaching of a pious one.
Concerns (andese) of birth and death are wiped(mitey) away. The teachings of purified or pious one are completed(puran)- or one could say the sayings of purified people are
complete. ਭਉ ਚੂਕਾ ਨਿਰਭਉ ਹੋਇ ਬਸੇ ॥ ਸਗਲ ਬਿਆਧਿ ਮਨ ਤੇ ਖੈ ਨਸੇ ॥ Bẖa▫o cẖūkā nirbẖa▫o ho▫e base. Sagal bi▫āḏẖ man ṯe kẖai nase. Fear removed, live in fearlessness. All body ailments destroyed and so leave the mind.Reference:: Sikh Philosophy Network http://www.sikhphilosophy.net/showthread.php?t=38451
The fear is finished(chuka) and the person lives(basey) in a state without fear(nirbha-o) or empty of fear.*next line was a little tricky, I tried breaking down single words and getting them together*
man te (of the frame of mind) khai(destroyed,eradicated or cured may be?)
nase(make exit or leave outiside)
With this breaking down, I got-
-It destroys all of the diseases in a persons frame of mind and orders them out to leave.- ਜਿਸ ਕਾ ਸਾ ਤਿਨਿ ਕਿਰਪਾ ਧਾਰੀ ॥ ਸਾਧਸੰਗਿ ਜਪਿ ਨਾਮੁ ਮੁਰਾਰੀ ॥ Jis kā sā ṯin kirpā ḏẖārī. Sāḏẖsang jap nām murārī. One who one is from, such has shown favor. In the company of the pious singing understanding of the creator.
I think your translation was more clear than srigranth.org-
I think it could apply to 'the soul which is from the one, has shown such favour or generousity(kirpa) ਥਿਤਿ ਪਾਈ ਚੂਕੇ ਭ੍ਰਮ ਗਵਨ ॥ ਸੁਨਿ ਨਾਨਕ ਹਰਿ ਹਰਿ ਜਸੁ ਸ੍ਰਵਨ ॥੭॥ Thiṯ pā▫ī cẖūke bẖaram gavan. Sun Nānak har har jas sarvan. ||7|| Tranquility comes misconceptions and wandering ends. Nanak, when listened to the praising of creator and only creator’s virtues.
It reaches it's level of stability or permanent resting(thit pa-i) and the wandering(gavan) in doubts(bharam) is absent or reduced(chuke). Nanak , listening to the repeated praises or listening repeatedly wth pure creator and appreciating its recalling(sarvan)
It's amazing, as there is so much said in so little words, that we could go on and on trying to get more clarity here.