I definitely think Hitsugaya's shikai should be his bankai and vice versa.