Yes, but you have to start all over, you have already built a pattern that has habits you don't want to reproduce. So you need to start with a new hit, and then when you have the hit you want, build the topspin on top of that.
Or you can try to build a topspin without upper arm on your current...