Yes, those are the best options.. but the last one is by far the better in my opinion.
Check out the threads of people who start having troubles with their auto trans... were not the greatest in the world when made... had lots of changes and tweaking done to them...and you can hardly figure on finding someone who really knows how to rebuild them ( at less than $2500 ) .... which by itself was $500 more than I paid for my wagon in the first place...
A non turbo 617 has more room in the engine compartment... and more power than a 240... and a good manual trans serviced properly will probably outlast the rest of the car...