BLO over wax is not a good idea.
The TruOil finish is a good classic finish. To remove wax, you need a mild soap (Ivory) and water (since you've got an oil finish the water won't hurt just don't soak it), but I would use Murphy's Oil Soap and 0000 steel. Keep buffing the wax until it's gone, then clean w/ mineral spirits. Look at the finish--you might be good to go, or you may want to reapply TruOil. Rottenstone is a great idea, but let your final oil-finish cure and decide from there.
I refinished an oak rolltop desk 2 years ago and got the 30+ years of dirt/wax/smoke gunk off w/ the Murphy's Oil Soap plus it won't hurt the wood, but don't use it on unfinished wood. Clean unfinished wood w/ mineral spirits which won't raise the grain.
