To be safe, do both - apply EAD and petition for H extension for another 3 years. If anything goes wrong with your GC, you at least still have H status to save your time to find remedies.