I think your plan is a good one…albeit somewhat tedious, but I can tell
you that the re-pop grilles are not necessarily bolt ins!

I think you are better off attending to the cosmetics on yours rather than
the headaches of making the Chinese stuff fit.

my opinion of course
mike