The 430L 3150 would be better than the 430L 3550 because the 3550 is too fast to use the correct pinion. Actually, the JGF 400DF and 12T pinion is an excellent motor for the 36. It is only 40g and makes about the same useable thrust. The problem is it uses a 3mm shaft and you are bound to brass pinions, unless you have a machinist that can make a 3mm to 3.17mm adapter sleeve. You could get the JGF 400DF with a 2.3mm shaft and use Revco steel pinions. Be sure it is JGF 400DF, not the imitations. I have hundreds of 9 minute flights on mine, and so far it has been as new. You will need a Phoenix 25 or 35 esc and Castle link adapter because the 400DF is not so compatible with generic escs. Do that and your power problems are over. Get the 35a esc, then you have some room to upgrade. Not a big price difference.
That is not a super 3D setup, but I don't think you are advanced enough yet anyway. Plenty of power for rolls, flips, loops, maybe not tic-tocs, I never did a complete maneuver in any of the listed, but the partials show plenty of power to complete them.
You should also get a 3 amp external BEC to power the system. Most escs are weak there.

CH