Thoughts on bag upgrade

I've been playing off and on for a few years but really want to get into the game this year. Five rounds in this year and I'm coming to the realization that these 30-year-old blades I'm hitting are doing me no favors, so I'm making changes across the board. My biggest focus was finding some good game improvement irons to give me more confidence; at address, these irons are dominating me. I also have huge gaps between clubs that I'm trying to even out (specifically D-3i and PW-GW). I'll be able to upgrade everything but driver and putter for right around $1,000.

OLD
Driver: TaylorMade M2 9.5*
3i-PW: Titleist DCI Oversize + Black 22*-47*
GW: Tour X 56*
LW: Tour X Black 60*
P: Odyssey White Hot 2-Ball

NEW (planned)
Driver: TaylorMade M2 9.5*
3W: Callaway Paradym Ai Smoke MAX D 15* ($155 used—purchased)
3H: Callaway Paradym Ai Smoke HL 18* ($145 used—purchased)
4i-PW: Takomo 101s 20.5*-44* ($490)
GW: Takomo Skyforger 48* ($90)
SW: Maltby MAX 1.05" 54* ($90)
LW: Maltby MAX 1.05" 60* ($90)
P: Odyssey White Hot 2-Ball

I know there have been dozens of posts about DTC brands (Takomo, Haywood, Maltby, Sub70, etc) and after taking everything in on lofts, customization options, reviews, and aesthetics, this is the setup I think is best for me.

I know there will be plenty of people saying "get better before you spend more money", "it's the farmer not the tractor", etc which I mostly agree with, but the lack of confidence at address—and even after puring it—plus the gaps in the bag are my justification.

I'm mostly wondering what people think of the club choices themselves and if anyone would do anything differently given what I've been carrying in my C130.