I have a feeling Ginny will be waiting when Harry's finished doing what he needs to do. :-)
I think Giny will fight along Harry's side. Not to mention they will see each other at Bill and Fleur's wedding.
My money has it that resolution to the whole story will come from or at least touch upon Harry's relationship with Ginny.
Hand waving arguments to back this up:
-Ginny is allegedly the first female Weasly child to be born in generations.
-She's supposed to be quite powerful. Who knows, maybe Snape is a vampire and Ginny's bat-bogey hex will figure in.
-She and Harry share a very special bond that was created when Harry saved her life in COS.
-All the focus on the love thing.
JKR seems to subscribe to the old noir novel notion that a gun never gets put on the table without being used. Ginny's unique status, potential and relationship to Harry seems like a fairly high caliber gun on the table.
We'll see how far off base I end up being.