To swap to the round headlights , yes you can , you have more chance here.
Fire up ebay, and get these (without skipping either, as they are all required)
This could workout being the quickest way to ago about things.
Oh yes , don’t forget (not critical but completes the look)
- Air Vent (left and right side)
- Infill Panel (mini triangle for the right side of the nose cone only , aka “inspection panel”)
Otherwise , 2016 “front end” is strictly for 2016 only – you can’t mix and match. You either want the older look (2005-2009) or the newer 2016 look