Bedtime getting earlier

My son hasn't been wanting to nap later in the afternoon. He was taking 3 naps a day, but the last one hasn't been happening. The issue is that he's awake so long he becomes a raving lunatic before it's bedtime. I've been having to put him to bed earlier because he'll go off the deep end if I try to wait until 7:00 like we were doing. But now obviously he's waking up earlier which isn't ideal.

Any advice? Should I move up bedtime? He doesn't really seem like he's ready for just 2 naps. ? Idk.