I think Trainli is the winner LGB only has two curved switchs(L/R), but Trainli has about 2 dozen. It solves the other problem I was having designing with piko switches posted under "clueless" thread.
Pretty pricey though
, I glad my kid is out of college.
I just have to get RRtrack software, it is the only one I could find with Trainli Track Library.