Power supply has been properly tested and the X2 capacitor replaced now. Quick photo for reference:
Small bit of jitter in the timebase. Will look at that another day.
I really like how this is constructed. Unlike Tek they designed it so you could get to all the bits!