I finally finished a kit from Train Station Products, I ordered it to meet the specifications of an Amtrak Heritage diner, even more specifically, 8502.
Completed pics:
I think it came out great and was able to avoid the nightmare of trying to customize a Broadway Limited California Zephyr...