09+ VVT and MDS bypass?

Just thinking out loud here, does anyone know where to get a kit for blocking off the MDS and also what to do about the VVT on a 2011 5.7? Im looking at buying a complete motor from a truck to swap into my demon, but I want to simplify it a bit. or should i just find a earlier 6.1 or 5.7 to used the heads on... Any input is appricated.