I'd seriously consider keeping what you have... You already have the best engine,IMO everything new is a downgrade exc the 32.5 kubota. I'd stay away from the diesels in either machine unless your running light use only, you'll lack power in hard use, and heavy cutting conditions.