On the upside, the new gear set is in good shape, and 5 of the gears are common between the F4 and F4i, including the 33T gear (for 2nd).

This leaves me one gear that definitely needs to be machined, but with the dogs protruding, it shouldn't be that hard