You're right, the '04-'06 model fairings wont probably fit the '07 model. The lower fairing attaches to the mounting of the upper fairing (the lowest screw). And the bottom part of the upper fairing is slightly different in '07 bikes.
To be sure, you could always check that from TCP, which...