Oh, yes. Battling a foe is something Harry knows how to do. Reconciling with a lover who's hurt him is something he's never tried, and it's entirely beyond Draco's experience for various reasons.

I hadn't consciously made that connection, but that's essentially what Snape hopes will happen.