Tail light retrofit

I have a 2012 Pruis C with 145,000 miles on it. Recently, the left tail light started to go out. I found I could rap on the side of the housing, and the light would come back on for awhile. Now, the right taillight is acting up.

So today I installed new bulbs in both lights. However, in removing the left housing, I found that it is delaminated on the forward edge, and that water had filled up the housing, taking out the reverse light bulb, and obviously causing my problems with the tail light bulb. I drained out the water, but the reverse reflector, lowest down and filled with water for who knows how long, is darkly stained and ruined.

Next, I went to the right side. Sadly, In trying to get the right housing assembly loose from the car, the clips holding the housing to the body would not come loose, and though I tried everything, I was forced to crack the housing lens in two places, just to change the stupid bulb.

Now, although I have all lights working at the back of the car (with exception of left reverse bulb), I have one delaminated housing on the left, letting in water and staining the reflectors, and one cracked housing on the right, that will also likely fill with water in a short time. So it is time for new tail lights!

My question is: Will the newer tail light housing assemblies from the newer Pruis C's fit my 2012? I'd rather retrofit with them, if they fit. They look better, and hopefully are better designed. In looking online, I see nothing on the subject, but the newer housings look as if they attach to the car the same way, and I doubt that Toyota would have changed the sheet metal of the car over the years. The back sheet metal of the new car looks the same as mine.The wiring harness compatibility is a question, however. Anybody know if they will work? ​