I'm confused. You said you wanted a full frame, then purchased a crop frame mirrorless?
IMHO, full frame is only required for wide angles and viewfinder experience. A D7100 has the same number of pixels as a D600, no AA filter, and since you said you're not a wide angle guy, you have all the lenses in the world to choose from (so to speak).
Just thinking out loud for a while, you currently have numerous kits, each with their pluses and minuses. You like the extra reach than m4/3 gives you for macro with a 60mm and the 300mm tele.
With a D7100, you could get a 105 macro, whichever landscape lens you choose, and the 300/4 (450 effective @ 24MP - which would give you the same number of pixels as the OMD at 600 effective @ 16MP). Now you only have to carry one camera system with you!
Anyway, its your choice after all, and sorry to hear the Fuji didn't work out. Keep us posted on the decision.
Michael