Yes i do believe that they both have surpassed their master... however, I would say he could put up a good fight to say the least.
Yes it's true that kakashi said himself that Naruto surpassed him although that's before he learned how to fully control his "Ms". Naruto has had many upgrades himself such at Sm,Km and Finally Bm.
Sasuke is on the same boat Naruto, It's not clear enough to speculate on just how strong Sasuke "Ems" is at this time although, that being said you can't ignore the fact that sasuke can spam allot of his most powerful techniques.
I like kakashi and i think he's an incredible Ninja and a more well rounded ninja than them both, although when it comes to power, he's outclassed which is obvious since their both main character's.
Naruto > Kakashi 1/10
Sasuke > Kakashi 3/10
Of course that's just my opinion, i rightfully respect yours.