Yeah, I would do a 3L swap with an ATX (IF it would be as reliable as an MTX) if I had the money. I'm trading a 1 year technical support contract for the car, so no money is actually changing hands. IF I had the money to spend on the tour, I would probably dig around the yards for a SE with and ATX and a 2.5L and throw a block (pun intended) party to get it installed.
