Sag under 3.5v /cell was too hard on mine, at least the questionable cells. The decent packs didn't seem to mind.
Idk if you can trim the halfgrip down, but I really like a nice short halftwist. Mines like 1/3, and it could be shorter. The right hand got a little tired with hard riding at first, but it got stronger eventually. Also, on custom displays, there are 2-4$ volt/ammeters from china there are a nice addition to the more plainjain throttles/setups.
Jest, are you considering getting the frame fixed? Aluminum is far more rigid than steel, but can only be 'loaded' so many times before breakage. Nothing wrong with AL, but it has more of an expiration date. A fix on the weak spots could lead to 100% increase in life, but if a modified bike makes it way past the natural obsolescence, one would want to be extra careful of more critical areas, such as headtube etc.