RE: CPP gyro trouble.....
If you are going anyway, you might look for the GWS motor, GW/EDP-50H or the CN-12 will work, and the prop and adapter GW/H001-FD5002-030B, and there are several other props that will work.
No mod to the tail is needed, except you might have to "drift" the screw holes over a bit.
You already have the heatsinks! But GWS makes one that fits better.
Much better performance and quieter than the dual system.