You also need to add Piccolo (with energy from Gohan and Krillin), maybe leave it at something like 2,400,000? And Vegeta (reviving) at 3,000,000?
I don't think Vegeta was too intimidated going up against Piccolo and Gohan. I just think Vegeta could very easily defeat Piccolo, but that would...