I have been examining the differences in the two engines. The 25cc uses a straight bypass port and the 30cc uses a windowed piston to make up for the restriction in the ports. It is possible the 25 can be reworked to exceed the capabilities of the 30. The port timing on the 30 is also different from the 25. The advantage of the 30 would be more torque at lower speed.