That layout has a nice flow. I didn't do cut-ins. The purpose was exactly what you did. I also didn't round out the benchwork.
I assume the track is on the rear of the furnace and it's serviced from the front.(side opposite the track).
I'll mod the first file.