Both are good choices as mentioned before but fit can be adjusted by the shop if you tell them what you didnt like about the Trance compared to the Marin. They are looking for a sale aren't they?
When you wrote "felt better" might it be the air settings on the shock and fork? Dialing in the right pressures takes trial and error. Didn't the Trance have better shocks and forks as well.