you're right naruto and sasuke have not improved but become weaker due to peace times.
if sasuke did master his rinnegan his katana would never have been marked by shin and he would have been able to easily stop the shin
http://narutobase.net/manga/naruto-gaiden-the-seventh-hokage/6/9/
also...