You'll really enjoy the A21, which on its own is great. Of course the JC5 in my experience is a major step up in every way, but comes at a higher price.
I've seen a few JC5s used for sale for really good prices lately so you could keep an eye out for a good deal that way.