Is he stalking me........?

You were just being friendly, but to the point. This guy sounds like a total creep, I wouldn't even wait till he does something else.. I'd say find out his name from the gym(explain your situation to them) and contact the police as soon as possible.