I just fixed my amigos today, using the ABS mod here: http://landroverclubvi.weebly.com/abs-mod.html , which seems to be the go-to guide for getting rid of them.
If the root cause of your amigos is the same as mine, then replacing the shuttle valve switches wouldn't help, because it's actually...