I have both and I see them everyday. I'll have to say that a 98-01 front-end makes the car look a lot newer to me.
But, 94-97 foglights with a 97 ITR front lip like you have, and new headlights with a new paint job sure is a rarity these days and the keeps the vehicle's originality. Thats I'm going to do to my '95, with amber turn signals.
Actually, I was about to buy new headlights the other day...I went to Streetlightz and they said they could order me new oem 94-97 headlights for $250. Try them.
I vote for D, with a new 97 ITR lip. They all look good though with a paint job and headlights, thats for sure.