My point is, no matter what you do to your bike, you are never going to keep up with a $30K machine. Its just a whole other class of bike. If you are not careful, you will wake up one day and realize that you have in fact spent $30k in your current bike and still cant keep up.
I wouldn't change a thing.