I had a similar problem. When the diag mode comes up in the touch, select "device settings". Screen will flash once. go back and disable the diagnostics. This worked for me to bring it back to normal mode.
If this does not work, try out the imgtool suggested by geekmaster in the above post. That is an awesome tool to get out of difficult situations when you are not very familiar with things like me
