You might want to check out VidaOne MySportTraining and Diet and Fitness. I use it primarily for tracking running, but occasionally for cross-training/lifting as well.
I prefer it because of the windows Mobile and desktop syncing. It's not super cheap, but there's a trial.
http://www.vidaone.com/mst_ppc.htm
There's also web apps like Gymtechnik (
https://www.gymtechnik.com) that may work for you...