Yeah, I skipped on getting expensive Ultegra or extra light carbon frame, as I feel that don't really impact performance much. But I will definitely go for disk brakes next time. It's just smoother, and doesn't strain the hands as much when going down steep mountains. Even better performance as I with a disk brake bike dare to go faster because I know I can easily slow down before.

You are probably also right about the power, but from my workout yesterday my avg was 242 watts, and peak 686 w. So I still think it's about the same 8)