Yea I always wondered if it's a good idea to just take out the 4 Mox Diamond? You bring in so much vs DnT anyway & this way you keep your land count high(which is good for Tracker,too). Rifstone Portal seems good here, I agree.