Transmission swap E153 or C60 / C65-01B Options

[That_Black_Celic...]

Greetings all, i've been thinking about a potential transmission swap when i swap my beams engine in as i'm not certain the stock C54 tranny will take the power and i feel the gears are a little too short. i was wondering if i could get some insight on some potential swaps.

My first idea was a 6 speed from the 7th gen celica the C60 or C65-01B which comes with a helical LSD, i heard if you just swap the dumbell for any C5x transmission it will work apart from possibly some mount locations and/ or shifter cables and shifter.

My second was the manual 5 speed out of any 93-01 camry the E153, its the same transmission they put in the mr2 turbo so i know it'll hook up to a 3S block and the shift levers on the tranny look very similar, i would only be concerned about mounting points and possibly axles.

If anybody has done either of these swaps some help would be greatly appreciated.
Thanks!