Upgrade to a 3.2 Evo sump / S54 sump and oil pump. Buy these beforehand and get the pump rebuilt. Don't bother with baffles as KwS says, the factory ones are more than enough. Focus on what causes oil nut failure - stretched and worn chain / sprocket. Failure on S50x parts aren't as common as the M50x pumps either.
Would also recommend bottom end bearings if you're going to be removing the subframe, and paying someone to install everything/ do the bearings at the same time. Have recently got a quote for a S50B32 bottom end refresh and it's come to $1700 incl GST total, that's parts and labour inclusive.