That'll work.
When I did my re-power, I swapped the CAV for a Chinese fake Racor unit (was about £30 complete). Makes life a lot easier and cleaner.
I also added an outboard bulb primer in the feed pipe between the tank and the primary filter, which makes bleeding it a doddle.