Rebuild, it will be cheaper to start with and in the long run, especially if you're only looking for 500 hp. For 500hp run the original crank, rods and block. No need to step up anything.