Bit of a late reply... Im about an hour from the city, so a bit too far out, but you are right about getting a training buddy for motivation, its alot harder to be lazy when someone is relying on you to train with them..
Mate, you are lucky to have a free gym setup,
I would be hooking in to that.
Goodluck with your training!
“Animals do have a voice. If you ignore their suffering, I will remind you of it. If you don't understand them, I will translate. If you don't hear them, I will be their voice. You may silence them but you cannot silence me as long as I live.” ~ Anita Mahdessian (C