Jack Carpenter has something very similar, same routine ( though a slightly different handling, which is quite basic ), though he ends with 4 aces and stops right there. Ends dirty as well. He shared it in the Cafe, look it up there.
I LOVE this plot ( and assemblies in general ) and been working on several handling ideas, my aim is to end with the 4 aces and finish clean. While I dont mind ending dirty in my work but in this case I think a clean ending is important.
I too felt the queens are out of place, though it depends on the patter used too.
You could use them though in other effect. Like if you do the switch, though keep an ace on the face and table it. You now have a packet ready for a next effect which involves the aces.
Cheers from another assembly fan,
I thought the video was clear enough.