i saw a wagon for sale locally here that someone swapped in a t56 6 speed transmission into
1996 buick roadmaster wagon 6 SPD. MANUAL
his isnt exactly built for mileage due to the 456 rear but it might do better than the 4l60 with your factory ratio. the 350 should have plenty of low end grunt.