XPS 8930, adding more case fans & possible power issues

Hi there!

I've had my XPS 8930 for a little over 2 years, and I've added some components over the time I've had it.
Old Specs (specs bought with):

• CPU: i5-8400
• GPU: GTX 1050 Ti
• 16 GB DDR4 2666 MHz
• 1 TB HDD
• 450w power supply

New Specs:

• CPU: i5-8400 (unchanged)
• GPU: GTX 1660 SUPER
• 32 GB DDR4 2666 MHz
• 500 GB M.2 NVMe SSD
• 1 TB HDD (unchanged)
• 460w power supply (unchanged)

I've recently started playing some heavier games like Apex Legends, Call of Duty, etc. Playing them normally is a breeze, 1080p 60fps, no problem. But when my computer starts to heat up, I get lag spikes every 5-7 seconds and it gets really annoying. And sometimes games that aren't hard to run at all can cause lag spikes, even if I made the sacrifice of turning down some of the graphics settings.

I also believe that I may have power consumption issues because my computer will occasionally (but not very frequently) bluescreen whenever it's running heavy games as I mentioned earlier. This started happening when I upgraded my GPU from a GTX 1050 Ti to a GTX 1660 SUPER. I am thinking about upgrading my power supply to something around 550-600 watts because I might want to upgrade my CPU in the future.

If any of you with the XPS 8930 has upgraded their power supplies and/or case fans, please tell me how it may or may not have helped you.

Thanks so much!