I applied 4 coats of tung oil (the stuff thinned with mineral spirits, not 100% pure) to small cherry table top, allowing 24 hrs in between each coat.  After a couple days I applied 3 coats of regular clear Briwax, buffing in between.  The finish isn’t very good, has swirl marks and other imperfections.  I think my error was that I didn’t wait long enough for the tung oil to cure.
 
Q1:Is that right?

Q2: I would like to remove the wax and apply a different finish, can I use mineral spirits or pint thinner to remove the wax, while not harming the tung oil?  Or is there a sounder approach?

A million thanks for your help!