I did read somewhere that Castiel's storyline is definitely going to be meshing with the main plot down the line and not just separately, so I have no doubts that whatever is going on -- soul-wise or something else -- that Heaven's work is tied with it too.