abrasion

Found a rip in the nylon layer of my neoprene drysuit while assembling my gear for tomorrow morning. Haf planned to do a dive in the morning (in about ten hours). My first instinct is to trim down the frayed nylon with fabric scissors, then hit the neoprene itself with 'Aquaseal + Neo Contact...

Been diving a backplate for about a year and notice a significant amount of wear on my wet suit where the straps are digging in. Also, not very comfortable. I dive HP100 with a back mounted 19 Pony so not the lightest of rigs. Looking for recommendations on what to use to cushion the straps...