In my experiences, Windows updates/upgrades are always such a pain and eventually run into problems to be honest.
I'd suggest if possible, do a fresh install from ground up! Always better.
I think I've DEEPCOOL Castle 240 EX ARGB Addressable RGB LED CPU Liquid Cooler I AIO Support Intel LGA2066/2011-v3/2011/1700/1200/1151/1150/1155 I AMD sTRX4/sTR4/AM4 - DP-GS-H12W-CSL240EX-AR https://amzn.in/d/g291mlJ
Let me know if you're interested.
Location of item is Bangalore
I think you can give Artis a try.. they provide two yrs of warranty for both battery and UPS which is not common. Usually everyone give an yr on battery whoch dies quite early