Agreed with Billy. You're most of the way there, might as well go the whole nine yards. Also agreed that going high end on pick ups wouldn't make sense. You might want to skip getting Fender Texas Specials and get Fender Tex-Mex pickups at about $110 savings (apply logic you whatever brand you prefer). At minimum, it's good experience and helps you to understand everything about the guitar and really helpful to do your own repairs.

I used to most of my own setups many, many years ago but I've lost my confidence in doing so..also, I was pretty broke in my 20's and had to do setups because of $$$$$, so there's that.

I've been kinda wanted to do some mods on my Strat (I've had some parts for years) but it's a 30 year old Fender American so I'm still a little hesitant.

For you, good experience on this first guitar and if you get spendier instruments in the future you'll be less of a 'fraidycat like me.....