Try this from bart, slightly modified, see if anything works now.

Change-Id: Ic4552488a79b2c2b11b63e2015a769c94cf1bbc8
Use my touch recovery

Change-Id: Ia2f0ee4081a63459a3d84042e070dcb9e465dc7d