I'd like to suggest that scientists assigned to the AWC and Psi Lab continue to contribute to research.
The reasoning is:
1) Both AWC and Psi Lab really only become truly powerful once you staff scientists in them. That means when comparing them to say a GTS, Proving Ground, Lab etc you should really also include the scientists you need to buy for them.
2) When you include that cost, those buildings are really expensive and are hard to justify early.
3) There would still be an interesting trade off in mid game in deciding whether to put the scientist into a lab or into one of the other buildings.
I'd also consider doing this for scientist haven advisers, it'd become a much more compelling choice, particularly early game when scientists are such a critical resource.