re the wedding: if she's not dating you now, is it realistic to expect her to be treating the wedding like a date with you? If not, then you know what to do.
re the holidays: I wouldn't spend the holidays together unless you're working on reconciling. She needs to see the cost of what a separation is. Figure out some reasonable split of Thanksgiving and Christmas...