If your bird is still under warranty I wouldn't be doing any diy repairs until the warranty expires. If you have to send it back again for other issues under warranty and they see your handy work then they arent going to entertain you regardless of what the problem is.
Once the warranty expires do as you wish.
As for DJI Europe...I got mine back yesterday from Netherlands, one month it took from UK...craked shell replacement, looks to be the same gimbal, well its the same serial number anyway lol, couldn't say if its the same insides, i've heard a few dodgy stories of people getting different machines back. It was packed better than I sent it although the gimbal guard wasn't attached which was concerning...it may have detached during transit. Just after a test flight...more of a test hover out of fear lol...all appears ok so far.