Different fenders does explain the dualities of your Tj’s turn signals. So your conundrum is to either go with flat fenders or hire a body shop to fill in some holes. Or live with extra marker lights. If the grille mounted lights are well done and rust free i’d mod the fender and make your Tj different from all the others. And you can get a better paint match on your fenders. Jeep on.