You're pretty much there, you only need 1 good team to be a good contributor in raid if your guild uses the Super Team Strategy (written by me, https://forums.galaxy-of-heroes.starwars.ea.com/discussion/79590/the-underpowered-guilds-guide-to-clearing-heroic-aat-the-super-team-strategy#latest). Get your Wedge to G11, Leia to G10, farm some great Mods and you're ready to put in a 1m run in P4. Even a 500k run in P4 and your contribution is solid, IMO. I run a top 50 guild and it would take my guild maybe two weeks tops to get you heroic ready.