Tim, I guess I'm kinda bias, since I'm planning an engine swap too.  I think
you should stay on this list with the engine swap stuff.  (Hope I'm not
overstepping my bounds here).  If you do go elsewhere, please inform me.
PSD.
Oh yeah, a dry sump system on your Sub motor would increase your ground
clearance and oil capacity.  Don't know if this piece is readily available
or how deep your pockets are....:)