I would do the tower at CSR. There are no real high floors at AKL, and I assume your fiance likes high floors for the views, which means a standard view (which could just overlook a parking lot) could be disappointing. Lots of people mentioning Jiko--not open yet, and no opening date announced--and if it does open you could always use some of the $400 you are saving for an uber ride to and from dinner.
I wouldn't book Swan because as much as people complain that disney has reduced onsite benefits, I find some to be still very meaningful. Most significantly, dining reservations are extremely hard to get unless you have the onsite hotel advantage. Also, Swan buses to MK no longer go to the front of park--they drop off at TTC which is a long commute. I also really like being able to room charge to magic band. And since you are going in 2021, you'll have magical express if you stay onsite.