The JW Speaker lights were pretty much plug and play if I recall. There are a few clips that you have to get the hang of but after that pretty easy. I didn't do anything different or take parts off on my 2017.
I have the clips mastered but it occurred to me that the headlamps that you replaced might be different than the ones I am trying to replace. Did yours have halogen bulbs and looks like this?
![[Linked Image]](https://www.tm-img.com/images/2019/07/07/IMG_1840.jpg)