If you code it for replacement property being in MA, does that affect the CA return?  If not, then do it that way.  Technically, with the "clawback" provision, the property is still in MA for tax purposes until it is sold.

I'm not in MA, I'm just a believer that the ends justify the means.