Model S facelift question

[ggarcia013013@]

I was recently in a small fender bender where the driver who hit me from behind forced me into the car in front of me. The rear and front will need to be replaced. I wanted to take this opportunity to swap out the front bumper and opt for the 2016 refresh. Mine is a 2015 with the old cone nose. The hood will also need to be replaced but was wondering if the parts would match if they replaced the old 2015 parts with the new parts including hood and bumper? I read somewhere that the latch may be different. I figured this was the easier route than ordering an aftermarket facelift from Tsportline which costs $2200+. Any ideas?