These maps are not necessarily for humans to read.  Based on what you're describing here, you want two traffic control items for one intersection.  This is superfluous and I'd vote to not bother with the stop sign as there already is an electric traffic control device here.