You might try lowering your saddle a bit and moving it back a bit. I don't know how closely the shop tried to duplicate your position in comparison with the Masi, but it's possible the saddle positioning could have some room for improvement.

As best as I can tell the Masi with a 600mm ETT has a 185mm head tube length and a Salsa Vaya with a 570mm ETT has a 185mm head tube length(there's an error on the Salsa geometry chart for the current year Vaya, so I'm basing that length on the 2016 chart.) If that's the case, it seems to me that by tinkering with stem length, stem angle, and spacers, you should be able to get the Salsa's fit pretty close to the Masi's. The Vaya came with a 90mm stem? Going up to a 120mm was reasonable to try to make up for the difference in ETT of the bikes. What stem length is on the Masi?