You already have your answer, I'll quote you:
I could also swap most of the fuji's stuff onto the masi frame
The masi is cool and I want to ride it ... if I just switched the fuji parts over to it.
Whatever one I use will be ridden hard and raced like they should be.
The masi would be a better racing frame too
Sounds like you'd miss the Masi more than the Fuji as well.
Keep the Masi, ride the Masi, cannibalize the Fuji and build up the Masi.
You already know the answer - Masi.