With things like Oak I tend to build up the finish layers and sand back so it fills the grain wiping off after each sanding this helps over come many of the problems you have. That is just my way of doing it. Lets hope all is well in the end and by the sounds of it you are slowly getting there