Sofia, I think it's going to take a little while for Jake to earn her trust again if the last few episodes are any indication.
And like you were saying, I'd rather Cassie figure things out with Adam rather than her being with Jake and wondering what it would be like to be with Adam.
I was thinking about John and Jake, and I wonder if John sees a little bit of himself in Jake when it comes to Cassie and the whole "written in the stars" destiny thing. I'm sure that John knew all about that too, but cared about and wanted to be with Amelia, "destiny" be damned.