Thanks for your question.
Feeling bad for your situation.
MOST OF THE KIDNEY
STONE OR URETERIC STONE CAUSES PAIN DUE TO IRRITATION OF NERVE
NOT SIMPLY DUE TO OBSTRUCTION.
Though your stone is non obstructing but it causes pain so you should visit a urosurgeon and if he opine then you should go for operation to remove the stone and in the meantime you can take some antispasmodics like dicyclomine
to reduce the pain and plenty of water if by chance the stone will pass out.But you remember upto 6 mm there is high chance of the stone to pass out but in your cases it is unlikely so you have to go for operation.