Returning to stock for service (T-Moible)

view story

http://forum.xda-developers.com – I know there are already a few threads like this around but needed a little more concise answer... so apologies! I'm returning my phone for issues with the power button being unresponsive and wanted to relock the bootloader and return it to stock software and recovery. I'm good on everything except the recovery. After the latest ota update I can't get any RUU file to work that would relock everything since the 2.35 RUU isn't out yet I guess. What is my best solution for getting this back to day 1 so I can return the phone? Do I need to just manually flash the recovery? Will that get rid of (HowTos)