Order the 5020, put the 5032 where it goes and get rid of the 5030. The 5030 is weaker than a 5032. The 5020 is stronger than a 5032. The upper, I'd leave if it works ok.
Most the flipper strength issue are the need to rebuild the flippers. Once the coils are right, if the flippers aren't great, rebuild with stern parts and use vid1900's guide for help. It covers how to properly gap aswell as replacing the nylon bushing that's not in most kits - two of the most important factors in flipper strength.