The amount of the unified pension payable to an employee, former employee or survivor shall be the sum of:
(1) The amount computed according to subchapter III of this chapter, exclusive of service credited under § 8351(6) of this title; plus
(2) The sum of the amounts computed, based on credited service as an employee, according to subchapter II of Chapter 55 of Title 29; subchapter II of Chapter 55A of Title 29; and Chapter 88 of this title.