A motor swap may or may not be the answer. It worked to cure my power craze, for now. Different engines (to swap in) present different advantages, disadvatages, and difficulty in the process. Obviously the easiest and most predictable thing to do is the 240 kit, and this has worked well many people. It is the unpredictablity of a motor swap that makes it so you have to count on things taking twice as long as you expect. That said if you're a person like me then a motor swap would probably do nicely, but consider what you're getting into. Also I'm sure I'll get flamed but unless you're a die hard 2 stroke guy (which is totally cool) I wouldn't totally count out 4 strokes, I considered a yz250f engine but didn't even come close to having the money.