I didn't get a lockup with my AMD ATI R7 workaround but there was a momentary freeze when the i915 driver screwed up again.
So after that happened I tried the linux-lts ... Sadly I can't use that one because my wi-fi device crashes on startup:
[ 12.166125] ath10k_pci 0000:03:00.0: firmware crashed! (uuid n/a)
[ 12.166127] ath10k_pci 0000:03:00.0: qca9377 hw1.1 target 0x05020001 chip_id 0x003821ff sub 1028:1810
[ 12.166128] ath10k_pci 0000:03:00.0: kconfig debug 0 debugfs 0 tracing 0 dfs 0 testmode 0
[ 12.166577] ath10k_pci 0000:03:00.0: firmware ver WLAN.TF.1.0-00002-QCATFSWPZ-5 api 5 features ignore-otp crc32 c3e0d04f
[ 12.166734] ath10k_pci 0000:03:00.0: board_file api 2 bmi_id N/A crc32 8aedfa4a
[ 12.166735] ath10k_pci 0000:03:00.0: htt-ver 0.0 wmi-op 4 htt-op 3 cal otp max-sta 32 raw 0 hwcrypto 1
[ 12.169051] ath10k_pci 0000:03:00.0: firmware register dump:
[ 12.169052] ath10k_pci 0000:03:00.0: [00]: 0x05020001 0x00000000 0x00A0F774 0x00000000
[ 12.169053] ath10k_pci 0000:03:00.0: [04]: 0x00A0F774 0x00060130 0x00000010 0xFFFFE000
[ 12.169054] ath10k_pci 0000:03:00.0: [08]: 0x0042136C 0x00420660 0x00400000
<etc>
Oh well.