The same author also has "Ray Tracing: The Next Week", which introduces a lot of the missing features you mention. Chapter 3 introduces BVHs, Chapters 4-5 add

The same author also has "Ray Tracing: The Next Week", which introduces a lot of the missing features you mention. Chapter 3 introduces BVHs, Chapters 4-5 add more surfaces, and Chapter 7 adds cubes. There's a third book ("Ray Tracing: The Rest of Your Life") that tackles more sophisticated approaches like importance sampling.