No, you have not done it right. Don't mean to be rude but no one thinks about layout drawings like that. If you can not read schematics it is a must for any kind of analysis. Try this:
The feedback is active no matter which output you use, and the voltage at the 4 ohm tap stays the same no matter which output you are using.