I bought the T6.1 de-badged shiny front for mine. Was a bit of a mare to fit but so is the original messy clipping debacle. Also fitted the splitter to the front, also not easy to get right.
Basically, unless you're good with your hands and are confident, get someone who is to do things for you.
Once installed they look nice bye-the-way.