That is a very nice bike. I really like the behind the seat storage box. I have been looking for one that fits my bike, but it looks like because of the funky curve it has, there isn't one that fits. Hopefully with the new wheels, you can get it up to par with your Shiv.
Funny story, when I took my bike out for the first time last weekend, I was about 4-5 miles slower than my road bike. I was like what the heck is going on. I couldn't figure it out. So I kept going in hopes that it was just me getting used to the new bike. Then I took a look down, didn't realize I was on the small ring. Doh! Switched it up to the big ring and away it went!