If you have the hammer leaning on the valve a little as you say, then the best next move to improve your shot count would be with the hammer spring. A shorter/slightly stiffer spring that allows you to make that power without the hammer leaning on the valve should be a big help in the air waste department