Am I using quantity and price correctly in trying to calculate price elasticity of supply?
It does not really mater, as you will get the same numerical values eventually. You may choose whatever is more convenient in each particular situation. Convention is, however, to replase $q$ with $q(p)$ to derive a formula for elasticity as a function of the price only.