Exactly what I was looking for.
I looked at a lot of apps to help track my lifting. None of them did what I was looking for, until I found Gymaholic. It tracks everything you want, the exercise/lift library is massive. Very happy and impressed.
Oxf0rd about
Gymaholic Workout Planner, v5.8