I just pushed out the update, so if you start EditVoicepack and run "Update Flight Simulator with new ATC capabilities" it should change to line up and wait for FAA as well.
I did not have the possibility to verify it, I reverted to a fresh install of my flight simulators, and I need some more traffic to be put in line.
But it should work (famous last words). If not, please let me know. I will unfortunately be on holiday soon, and while I can work with EditVoicepack on holiday, I can't actually run FSX/P3D to verify, as I use a stationary computer for development.
If you want to play around with including select ICAO phrases even though you use FAA simply set the checkboxes in the Community Modifications/Phraseology/ICAO branch.
If the checkbox is set: This modification will be included.
If the checkbox is cleared: This modification will not be included.
If in the 3rd state: It will be included if the parent folder is included only. This is the default state. Switching between FAA/ICAO simply sets the appropriate parent folder checkbox.