So I Was Being Overly Optimistic
After the previous announcement I have managed, by various machinations, to reduce myself to about 0.5 functional computers, spread out over two different boxes. Almost back to two functional, but it's still a bit of an uphill battle...