You're almost there. Hell is the grave. Those in Messiah are resurrected at his second coming. Those not are resurrected at the end, after Yeshua's 1,000 year reign on earth to be Judged by him. Those whose names aren't written in the 'book of life' are said to be cast into the 'lake of fire' - some read this as cast apart (i.e., the second death).
Like I said earlier, before the cross Sheol (often times translated as hell) was the place of the dead. But after the cross, the believers go straight away to heaven, because to be absent from the body is to be present with Jesus (2 Cor. 5:8). Other than that, I agree 100% with you.