Since you already have a dozer again I vote for the biggest excavator you can afford. You can pile dirt A LOT higher with an excavator, and once you get in a rythym its a lot faster than you think. Only the dirt moving the farthest will have to be bailed five times, from then it gets easier and easier.

Dozers break a lot and drink fuel like they have a hole in the tank. If you think bailing dirt over and over again is a pain, try pushing it with a dozer over and over again. If your other excavator had a 2 yd bucket it was a decent sized machine. Rent the machine for a week, take a week off work, and then in between rentals clean things up with your dozer.

Have fun