Need a .21 engine recomendation

[GTodd]

Good morning all,  Im looking for a new engine for my 801x.  The engine in the build is a .28 that was in my 801XT (pre brushless conversion) that I converted from pull start to non-pull start.  The engine is a beast, lots of low end torque, but it was a pain to tune.  Im looking for a nice .21 that can do well in club events and is a little easier to tune. I dont need a top spec engine meant for worlds competition. Just something that is good enough to play with on the track and wont have me spending all day wrenching on. Thanks!!!