OK, I see your point there.
Aren't you going to lose the side panels and the rear section in the change though too?
That yellow tank really highlights that the tank badge and tank lower edge aren't parallel. I'd paint the lower 2" of the tank black if it were mine and try and disguise Soichiro's lack of aesthetic appreciation.