If the six isn't a problem for you why not fix it? If I were going to swap, I would go straight to the small block myself, because of the ease and expense.