I've got good tension, and have made a tool to deal with the top lever spring, so I think I'm set there. I'm expecting the trip and/or trip spring are likely the culprits.

Thanks.