On the reg/rec relocation, maybe move it straight up the front down tube above your upper crash bar tube. That would get it up to a more crash protected spot and up above the solid part of the fender so water, mud, and debris could not collect on it.
Worth a look anyway.