When I said in another post you were coming along in leaps and bounds I did not mean that you should start jumping a chasm. Well done and nice finish.
Having said that about the finish there is no need to use woodwax22 then followed by the high gloss wax. Use either one or the other as all you are doing is putting wax over wax. Saves money as well
When using oil I would apply it the same as you have done but leave for 1 week then buff using whichever wax I prefer. The reason for leaving it one week is I use a lathe mounted buffing system and it gives the oil plenty of time to harden properly.