I agree with you. There's nothing ungrammatical about "good English". As you say, it depends whether you want to stress what kind of English you should speak or how you should speak English.
New words, one handy idiom, and a 2-minute quiz — delivered to your inbox to keep your streak alive.