Warranty Support topic

So my usb port is messing up as now I have to add pressure to the cable in order for it to charge. I have cleaned the port and while there was a good amount of lint in it, it still needs pressure for it to charge. I have contacted HTC and they gave me the option to send it for repair or get a new one and send the old one in. However since it is S-OFF & rooted, I was wondering if flash the RUU and switch back to S-ON will it be ok? Since they had told me that if the boot loader had been unlocked etc it no longer is covered by the warranty. Sorry for the long post