Debating 5.7 or 6.1 swap

Yes. Unless you opt to carb and just run the MSD Hemi 6, pretty much any system (MegaSquirt, FAST, Holley, Mopar Performance, etc) will cover both sides.