Seems like I had the right idea.

4.15 runs amdgpu 3.23. May install a Mesa git version from a PPA after this to
check.

Really want the new kernels, so I'm probably gonna do that right away after
posting the two logs.