The definitions given here are actually quite broad. As far as I can see, they do not preclude vitakka and vicāra from being very refined, even pre-verbal movements of the mind.
The quote given here is not from the EBTs, but from commentaries. But in general an EBT is an EBT, regardless of school affiliation. It’s precisely for this reason that comparative study can be so illuminating.