Ummm, all of the above?

The original plan was to focus on the romance, but as I was outlining, I realized that it didn't have any dramatic tension - she dreams about guy, realizes he's real, realizes he's dead, falls in love anyway...

Boring.

So I added the villian, a la Amanda Quick, my favourite romance novelist. Now the focus has shifted to the mystery, with the romance as backdrop (love conquers all, etc.)

So I have a plan. It's just kind of weak and derivitive.