I'm not sure what your question is exactly; you seem to have everythign pretty figured out in your diagram.
The only thing I would add in terms of redundancy is some managed spanning tree circles and possibly moving some of your switches around and letting spanning tree "do its thing"
By setting the bridge closest to the VLAN 20 or vlan 30 router as the root bridge, a "star topology" will be formed centered on that switch for each vlan. Thus, by implementing this way, traffic from the wireless host to the internet will go through its AP, then the left of the 3 POE switches, then the left of the 2 core switches, and straight to the AP;
while traffic from that laptop to vlan 20 will go from laptop to AP to left POE switch to right core switch to corporate router.