Yes, the 7 pin with brass terminals in the plug and J-box at the other end is the ticket for me. I installed one on my sis's right and it worked out great. And as mentioned above, crimp connections with the integrated heat shrink on the existing wiring to get it into the new J-box just about eliminates any chance of connection failure when done correctly.
https://www.etrailer.com/Trailer-Wiring/etrailer/e99011.html?feed=npn&utm_source=google&utm_medium=cpc&utm_campaign=Google%20%7C%20Shop%20-%20Trailer%20Wiring&adgroupid=128484934262&campaignid=15586143335&creative=569877447301&device=c&devicemodel=&feeditemid=&keyword=&loc_interest_ms=&loc_physical_ms=9052718&matchtype=&network=g&placement=&position=&gclid=CjwKCAjws8yUBhA1EiwAi_tpEeDOl6XW5mY39SSDuW59vULY4aYi9LfKehQvmijD5uTThuMQ0M_oexoCarcQAvD_BwE