Gateway P6831-FX overheating

Hi, I own a Gateway FX laptop, and it has been overheating recently. Last time I cleaned it was around late January. I used the disassembling guide posted on the forums to get to my GPU and CPU fans, and thoroughly cleaned off all the dust that was trapped inside. After the cleaning was finished, the laptop was running cooler and less noisier. Unfortunately, the overheating started again and my fans are making a ton of noise. It mainly starts when I play video games. After about 45 minutes to 1 hour of gaming the screen turns black and I have to maunually reboot the system. So, I was thinking of opening the laptop back up and replacing the TIM on the GPU and CPU with something better to help cool my pc down. Would doing this be a good idea, and would it work? What TIM replacement should i use? I don't know much about TIM and replacing it, I just recently learned about it browsing through the forums and read that it could help cool down pc's temps. Any advice and tips would be greatly appreciated, thank you!

Also, I was thinking of buying a new laptop cooling pad to help with heat issue.

These are some that caught my interest:

1.) Cooler Master - NotePal ErgoStand Cooling Stand with Fan for Select Laptops - R9-NBS-4UAK

2.) Targus - Laptop Chill Mat - Black/Gray - AWE55US

Which one would you recommend? If neither, please share some good cooling pads.