Hi Steve,
Yes, everything you wrote seems to be correct.
ㄹ . . . . . . 살다 => 살은 지
(--> '살은 지' may be shortened as '산 지'.)
ㅅ . . . . . . 짓다 => 진 지
(--> '진 지' may be lengthened as '지은 지')
Hope it helps.
p.s. Korean grammar is such a pain in the neck even for native speakers.. :p