Yeah gen2 is a viable option as it's very similar to the gen1 You could just swap the manifolds and not even worry about the harness I meant use a 5S block/crank if you can't find 3S stuff. Forget other motors, too much aggro to get them in