I've a similar setup with no bodging and perfect fit.
Got my bits from here:

https://www.buybits.com/

Luckily, the shop isn't far from me so I could go and choose the bits i wanted and try them out there.

__________________
Bike: 2013 XT660Z, TKC70 tyres

Mods:
Barkbusters, Scottoiler, DIY Tail Mod, DNA Stage 3, Power Commander V & O2 Eliminator, Exan X-Black Stainless exhaust, Tool tube, Ohlins linear front fork springs, Nitron rear shock, JT front and Supersprox rear sprockets, D.I.D. VX 520 chain, Adventure Spec bashplate, DIY USB Outlet, DIY chain guide, Kev's Throttle mod

http://www.facebook.com/onemooseonemotorbike