Its as shame it took AF so long to make the change away from the "old style" marker lights. My 2010 still had them. In 2011 they went to sealed LED markers and I would bet their water intrusion problems greatly reduced. Anyone with a pre-2011 AF TC should make that upgrade immediately if not sooner, if you haven't already. Its the main culprit area for front end water damage.
From what I have read about other AF owners going back to the factory, most have been very pleased with the job done and the cost to do it.
I use a 41" hitch extension so you could probably get by with a 30".