go for the easy option. i reckon it's more to do with identification of common postural patterns - and this seems pretty above the line.
your exercises to improve you scapula stability will have no effect unless you have enough thoracic spine motion. horse before cart, not the other way around.
easy on the breast stroke, keep your chest up, pull down, don't poke your chin out.
cheers
sixphysio