Yeah, that should be your model. As mentioned, some b6-b7 parts are interchangable...i'd hazard a guess though that no headlights parts are interchangable between the models, they're quite different.
And as for the eybrow, I take it that's an aftermarket jobbie?