With those modifications planned just keep the 4 speed and give it a try, you'll probably like it just fine.
If you want to spend more time and money for another small gain research and try an NV4500 five speed overdrive transmission.
The other 5 speed OD that is an easy fit is not really large enough for a 1 ton is the T5 transmission from an S-10 among other things.