You're right. You are talking about quantity, so you want the plural ('one diesel', 'two diesels'). 'S is for possession ('my diesel's airfilter is clogged').
New words, one handy idiom, and a 2-minute quiz — delivered to your inbox to keep your streak alive.