Good work. I'm ok with the first half. The skeletal rearrangement is indeed a pinacol rearrangement. You have H2O leave to form a distinct carbocation... I did it in one step (i.e., electrons come down from OMe oxygen, carbon-carbon bond migrates, and H2O leaves all in one step). No problems there, though.
The second half, alas, is not an aldol. Give it another look and try again. Your scheme is correct up to the first structure on the 4th line (the neutral, rearranged, keto-aldehyde).