You need this for the right drive side. It also will work for what is probably your threaded headset. The second tool you listed will work for the left size. if you have a heat *** then heat up the bottom bracket shell to help break it all loose. Hopefully the threads aren't rusted together.

*edit* due to the politically correct liberals running this site I can't type the three letter G * N word that comes after heat.