Switching to Protoss from Terran (Again)

Due to my lack of having played terrans on NA ladder much so far, I am not sure how to gauge my success in this match up. The few games I have played were either won by me holding some type of SCV pull or me losing because I over extend before having a lot of late game infrastructure. The builds I used last time I switched have become obsolete due to the mine changes so I have adapted my style according to what I struggled against as terran. I have a few different openers that I do in the match up, but in general it goes something like this:
Fast Nexus (usually 1 gas zealot msc expand)
Some type of harassment (oracles, blink, dts) (optional, I randomly mix in harassment options based on my opponent and how I am feeling)
Robotics facility
Robotics Bay
Twilight council
After a few collosus, a third nexus
Add double forge and tech to templar with constant collosus production after securing third base
Then I kind of just sit there and build up late game infrastructure (gateways, cannons, templar, more bases, etc)
Then once I feel comfortable that I can't possible take any damage from counterattacks or lose to a potential base trade, I move out and try to kill the terran (or at least try to deny basses, but honestly they usually die to an a-move with a few storms)

I have played quite a bit of this match up, it really is gimmicky. Most stable style I have found that consistently survives NA protoss all ins and goes to late game (which I am actually not the bad at due to my terran mutltitasking/mechanics):
13 gateway
Double gas on 15
17 pylon
17 cybernetics core
Zealot while cybernetics core is building
Immediate stalker + msc
Constant sentry production with nexus
Robotics facility when I can afford it
So far this seems relatively safe (survives 10 gate 3 gate and almost all other 1 base all ins without a probe scout), although it seems weak against economic stargate openings. I usually do a chargelot/archon/immortal follow up into tempests (skytoss overall). I have found it to be really strong with good hallucination scouting from the early sentries.

Well this match up is actuall really simple, I felt like I was over complicating it before by going mass void ray. Now I do something like:
Gateway expand (with zealot and msc)
I randomly mix in some 2 base timings here to makes sure zergs fear me (and hopefully do not drone to much versus my passive macro play)
Always a fast collosus follow up, constantly scouting zerg composition/tech with hallucinations
Then I play aggressively and take more bases after I feel like I have adequately adapted to the zerg composition, I also am really annoying and send zealots everywhere.
Eventually the zerg dies over time (hopefully)
Swarm hosts have the potential to be very annoying, they make it take longer for me to win.