I am looking to replace my old powerline adapters (10 years old, another brand) for new ones, it is still working for what I need now but keeps dropping out, but I want to expand a bit

So my current set up is

- Fiber Broadband with Vodafone WiFi Router (doesn't support Mesh) in the study room, 1 of 4 ports connected to the current powerline adapter

- all devices uses wireless except my PC that is in the sitting room connected to the other powerline adapter

My problem

- Upstairs wireless signal is not great

- my current powerline adapters are old and need replacing.

What I want to do is

- Replace current powerline adapter with PA9020PKit, one in the study connected to the provider wifi router and the other in the sitting room connected to my TV

- Get WPA8631P, and connect it to TV and console in bedroom  via Ethernet, and at the same time extend the WiFi coverage upstairs

What I want to know is

- is the TL-PA9020P compatible with WPA8631P in that it will extend the network to it and still support ethernet connection in the bedroom

- will the WPA8631P act like an AP in that I don't have 2 different SSID downstairs and upstairs.

- or is there a better solution?

Please find attached picture for clarification.