I would install quick disconnects (the metal kind seem more durable) for your fuel lines (supple, return) to make the swap quicker and cleaner(no drippy fuel lines).
+1 I just did this and a fuel line re-route. Much cleaner looking -- no fuel lines draped on the right engine case.