Don't bother swapping the engine mate, you have heard it from me before and I will say it again, stroke the VQ25 using the TEPS 3.6L kit and then up the compression
Will be an easier and quicker build than a VQ35 and probably more reliable too.
VQ30det? Nah, stick with the 2.5L "treasured" engine.
EDIT: on second thoughts, you could always buy a cheap, used VQ35de and sell the VQ25 to a certain local who wants to stroke it to 3.6L .... Yeah, definitely go the VQ35 lol
Also, check your inbox for a couple of options if you want to go the VQ35