Well, since waterfall badges are hard to get I cut off the back of a belt buckle and installed that on my waterfall. Not really something you need to do before you re-install the part but is a nice looking addition. I used the silver oval one and it is already curved to fit the area perfectly.
Custom Die Struck and Die Cast Belt Buckles for Companies
You might also think about placing a wire up along the internal area and up to the windscreen area in case sometime in the future you think you might want to add LED's in that area in the future.
Good luck finding your wiring issue with the reverse, sure sounds like a PITA .......