I'd actually suggest running the 12" upgrade over the 04-08 front brake setup.

Its lighter and larger.